Index: content/browser/service_worker/embedded_worker_test_helper.h |
diff --git a/content/browser/service_worker/embedded_worker_test_helper.h b/content/browser/service_worker/embedded_worker_test_helper.h |
index 553833bb5e28822016b0b509944aa7a70a149d89..1d390d1e9dd1a773f37518be4a53955728b75e91 100644 |
--- a/content/browser/service_worker/embedded_worker_test_helper.h |
+++ b/content/browser/service_worker/embedded_worker_test_helper.h |
@@ -20,6 +20,7 @@ |
#include "ipc/ipc_listener.h" |
#include "ipc/ipc_test_sink.h" |
#include "mojo/public/cpp/bindings/binding.h" |
+#include "services/shell/public/cpp/interface_provider.h" |
#include "services/shell/public/interfaces/interface_provider.mojom.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -30,7 +31,6 @@ struct EmbeddedWorkerMsg_StartWorker_Params; |
struct ServiceWorkerMsg_ExtendableMessageEvent_Params; |
namespace shell { |
-class InterfaceProvider; |
class InterfaceRegistry; |
} |
@@ -76,15 +76,17 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, |
// MOCK_METHOD cannot be used for StartWorker because the mock method cannot |
// take move-only objects directly. |
- MOCK_METHOD1(MockStartWorker, |
- void(mojom::EmbeddedWorkerStartWorkerParams* params)); |
+ MOCK_METHOD2(MockStartWorker, |
+ void(mojom::EmbeddedWorkerStartWorkerParams* params, |
+ shell::mojom::InterfaceProviderPtr* remote_interfaces)); |
MOCK_METHOD1(MockStopWorker, void(const StopWorkerCallback& callback)); |
private: |
// Implementation of mojo interface; they just calls a mock function. |
void StartWorker( |
- mojom::EmbeddedWorkerStartWorkerParamsPtr params) override { |
- MockStartWorker(params.get()); |
+ mojom::EmbeddedWorkerStartWorkerParamsPtr params, |
+ shell::mojom::InterfaceProviderPtr remote_interfaces) override { |
+ MockStartWorker(params.get(), &remote_interfaces); |
} |
void StopWorker(const StopWorkerCallback& callback) override { |
@@ -92,12 +94,16 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, |
} |
// Default behavior which can be overridden by using mock interfaces. |
- void DefaultStartWorker(mojom::EmbeddedWorkerStartWorkerParams* params); |
+ void DefaultStartWorker( |
+ mojom::EmbeddedWorkerStartWorkerParams* params, |
+ shell::mojom::InterfaceProviderPtr* remote_interfaces); |
void DefaultStopWorker(const StopWorkerCallback& callback); |
base::WeakPtr<EmbeddedWorkerTestHelper> helper_; |
mojo::Binding<mojom::EmbeddedWorkerInstanceClient> binding_; |
+ shell::InterfaceProvider remote_interfaces_; |
+ |
base::Optional<int> embedded_worker_id_; |
DISALLOW_COPY_AND_ASSIGN(MockEmbeddedWorkerInstanceClient); |