Commit 268533aa authored by Tomasz Moniuszko's avatar Tomasz Moniuszko Committed by Commit Bot

Uninstall mock clipboard to avoid crash

Bug: 1050952
Change-Id: If7767893409c9c3d7f675100df67bc3a6ba81d43
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2050483Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Reviewed-by: default avatarRoger Tawa <rogerta@chromium.org>
Commit-Queue: Tomasz Moniuszko <tmoniuszko@opera.com>
Cr-Commit-Position: refs/heads/master@{#740602}
parent 99419231
......@@ -43,11 +43,17 @@ PageTestBase::MockClipboardHostProvider::MockClipboardHostProvider(
PageTestBase::MockClipboardHostProvider::MockClipboardHostProvider() = default;
PageTestBase::MockClipboardHostProvider::~MockClipboardHostProvider() = default;
PageTestBase::MockClipboardHostProvider::~MockClipboardHostProvider() {
if (interface_broker_) {
interface_broker_->SetBinderForTesting(
blink::mojom::blink::ClipboardHost::Name_, {});
}
}
void PageTestBase::MockClipboardHostProvider::Install(
blink::BrowserInterfaceBrokerProxy& interface_broker) {
interface_broker.SetBinderForTesting(
interface_broker_ = &interface_broker;
interface_broker_->SetBinderForTesting(
blink::mojom::blink::ClipboardHost::Name_,
base::BindRepeating(
&PageTestBase::MockClipboardHostProvider::BindClipboardHost,
......
......@@ -38,12 +38,13 @@ class PageTestBase : public testing::Test, public ScopedMockOverlayScrollbars {
// Installs a mock clipboard in the given interface provider.
// This is called automatically from the ctor that takes an
// |interface_provider| argument.
// |interface_broker| argument.
void Install(blink::BrowserInterfaceBrokerProxy& interface_broker);
private:
void BindClipboardHost(mojo::ScopedMessagePipeHandle handle);
blink::BrowserInterfaceBrokerProxy* interface_broker_ = nullptr;
MockClipboardHost host_;
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment