Index: content/browser/service_worker/embedded_worker_test_helper.cc |
diff --git a/content/browser/service_worker/embedded_worker_test_helper.cc b/content/browser/service_worker/embedded_worker_test_helper.cc |
index 2b05b9bb1c2c16538663d8c6c4a805a6ca229b21..daf636dca162db2d012c8e4d9c7c0eac13bdb3e9 100644 |
--- a/content/browser/service_worker/embedded_worker_test_helper.cc |
+++ b/content/browser/service_worker/embedded_worker_test_helper.cc |
@@ -58,10 +58,14 @@ class MockMessagePortMessageFilter : public MessagePortMessageFilter { |
class EmbeddedWorkerTestHelper::MockEmbeddedWorkerSetup |
: public mojom::EmbeddedWorkerSetup { |
public: |
- static void Create( |
- const base::WeakPtr<EmbeddedWorkerTestHelper>& helper, |
- mojo::InterfaceRequest<mojom::EmbeddedWorkerSetup> request) { |
- new MockEmbeddedWorkerSetup(helper, std::move(request)); |
+ explicit MockEmbeddedWorkerSetup( |
+ const base::WeakPtr<EmbeddedWorkerTestHelper>& helper) |
+ : helper_(helper) {} |
+ |
+ static void Create(const base::WeakPtr<EmbeddedWorkerTestHelper>& helper, |
+ mojom::EmbeddedWorkerSetupRequest request) { |
+ mojo::MakeStrongBinding(base::MakeUnique<MockEmbeddedWorkerSetup>(helper), |
+ std::move(request)); |
} |
void ExchangeInterfaceProviders( |
@@ -75,13 +79,7 @@ class EmbeddedWorkerTestHelper::MockEmbeddedWorkerSetup |
} |
private: |
- MockEmbeddedWorkerSetup( |
- const base::WeakPtr<EmbeddedWorkerTestHelper>& helper, |
- mojo::InterfaceRequest<mojom::EmbeddedWorkerSetup> request) |
- : helper_(helper), binding_(this, std::move(request)) {} |
- |
base::WeakPtr<EmbeddedWorkerTestHelper> helper_; |
- mojo::StrongBinding<mojom::EmbeddedWorkerSetup> binding_; |
}; |
EmbeddedWorkerTestHelper::EmbeddedWorkerTestHelper( |