Revert of ServiceWorker: Implement StartWorker by using mojo

content/browser/service_worker/embedded_worker_test_helper.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_EMBEDDED_WORKER_TEST_HELPER_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_EMBEDDED_WORKER_TEST_HELPER_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "base/optional.h"
-#include "content/common/service_worker/embedded_worker.mojom.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_test_sink.h"
-#include "mojo/public/cpp/bindings/binding.h"
 #include "services/shell/public/interfaces/interface_provider.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 class GURL;
+struct EmbeddedWorkerMsg_StartWorker_Params;
 struct ServiceWorkerMsg_ExtendableMessageEvent_Params;
 
 namespace shell {
 class InterfaceProvider;
 class InterfaceRegistry;
 }
 
 namespace content {
 
 class EmbeddedWorkerRegistry;
 class EmbeddedWorkerTestHelper;
 class MessagePortMessageFilter;
 class MockRenderProcessHost;
 class ServiceWorkerContextCore;
 class ServiceWorkerContextWrapper;
 class TestBrowserContext;
-struct EmbeddedWorkerStartParams;
 struct PushEventPayload;
 struct ServiceWorkerFetchRequest;
 
 // In-Process EmbeddedWorker test helper.
 //
 // Usage: create an instance of this class to test browser-side embedded worker
 // code without creating a child process.  This class will create a
 // ServiceWorkerContextWrapper and ServiceWorkerContextCore for you.
 //
 // By default this class just notifies back WorkerStarted and WorkerStopped
 // for StartWorker and StopWorker requests. The default implementation
 // also returns success for event messages (e.g. InstallEvent, FetchEvent).
 //
 // Alternatively consumers can subclass this helper and override On*()
 // methods to add their own logic/verification code.
 //
 // See embedded_worker_instance_unittest.cc for example usages.
 //
 class EmbeddedWorkerTestHelper : public IPC::Sender,
                                  public IPC::Listener {
  public:
-  class MockEmbeddedWorkerInstanceClient
-      : public mojom::EmbeddedWorkerInstanceClient {
-   public:
-    explicit MockEmbeddedWorkerInstanceClient(
-        base::WeakPtr<EmbeddedWorkerTestHelper> helper);
-    ~MockEmbeddedWorkerInstanceClient() override;
-
-    static void Bind(const base::WeakPtr<EmbeddedWorkerTestHelper>& helper,
-                     mojom::EmbeddedWorkerInstanceClientRequest request);
-
-   private:
-    // Implementation of mojo interfaces.
-    void StartWorker(const EmbeddedWorkerStartParams& params) override;
-
-    base::WeakPtr<EmbeddedWorkerTestHelper> helper_;
-    mojo::Binding<mojom::EmbeddedWorkerInstanceClient> binding_;
-
-    base::Optional<int> embedded_worker_id_;
-
-    DISALLOW_COPY_AND_ASSIGN(MockEmbeddedWorkerInstanceClient);
-  };
-
   // If |user_data_directory| is empty, the context makes storage stuff in
   // memory.
   explicit EmbeddedWorkerTestHelper(const base::FilePath& user_data_directory);
   ~EmbeddedWorkerTestHelper() override;
 
   // Call this to simulate add/associate a process to a pattern.
   // This also registers this sender for the process.
   void SimulateAddProcessToPattern(const GURL& pattern, int process_id);
 
   // IPC::Sender implementation.
   bool Send(IPC::Message* message) override;
 
   // IPC::Listener implementation.
   bool OnMessageReceived(const IPC::Message& msg) override;
 
   // IPC sink for EmbeddedWorker messages.
   IPC::TestSink* ipc_sink() { return &sink_; }
   // Inner IPC sink for script context messages sent via EmbeddedWorker.
   IPC::TestSink* inner_ipc_sink() { return &inner_sink_; }
 
-  std::vector<std::unique_ptr<MockEmbeddedWorkerInstanceClient>>*
-  mock_instance_clients() {
-    return &mock_instance_clients_;
-  }
-
   ServiceWorkerContextCore* context();
   ServiceWorkerContextWrapper* context_wrapper() { return wrapper_.get(); }
   void ShutdownContext();
 
   int GetNextThreadId() { return next_thread_id_++; }
 
   int mock_render_process_id() const { return mock_render_process_id_; }
   MockRenderProcessHost* mock_render_process_host() {
     return render_process_host_.get();
   }
 
   std::map<int, int64_t> embedded_worker_id_service_worker_version_id_map() {
     return embedded_worker_id_service_worker_version_id_map_;
   }
 
-  // Only used for tests that force creating a new render process.
-  int new_render_process_id() const { return new_mock_render_process_id_; }
+  // Only used for tests that force creating a new render process. There is no
+  // corresponding MockRenderProcessHost.
+  int new_render_process_id() const { return mock_render_process_id_ + 1; }
 
   TestBrowserContext* browser_context() { return browser_context_.get(); }
 
  protected:
   // Called when StartWorker, StopWorker and SendMessageToWorker message
   // is sent to the embedded worker. Override if necessary. By default
   // they verify given parameters and:
   // - OnStartWorker calls SimulateWorkerStarted
   // - OnStopWorker calls SimulateWorkerStoped
   // - OnSendMessageToWorker calls the message's respective On*Event handler
@@ skipping 40 matching lines @@
 
   EmbeddedWorkerRegistry* registry();
 
  private:
   using InterfaceRegistryAndProvider =
       std::pair<std::unique_ptr<shell::InterfaceRegistry>,
                 std::unique_ptr<shell::InterfaceProvider>>;
 
   class MockEmbeddedWorkerSetup;
 
-  void OnStartWorkerStub(const EmbeddedWorkerStartParams& params);
+  void OnStartWorkerStub(const EmbeddedWorkerMsg_StartWorker_Params& params);
   void OnResumeAfterDownloadStub(int embedded_worker_id);
   void OnStopWorkerStub(int embedded_worker_id);
   void OnMessageToWorkerStub(int thread_id,
                              int embedded_worker_id,
                              const IPC::Message& message);
   void OnActivateEventStub(int request_id);
   void OnExtendableMessageEventStub(
       int request_id,
       const ServiceWorkerMsg_ExtendableMessageEvent_Params& params);
   void OnInstallEventStub(int request_id);
   void OnFetchEventStub(int response_id,
                         int event_finish_id,
                         const ServiceWorkerFetchRequest& request);
   void OnPushEventStub(int request_id, const PushEventPayload& payload);
   void OnSetupMojoStub(int thread_id,
                        shell::mojom::InterfaceProviderRequest services,
                        shell::mojom::InterfaceProviderPtr exposed_services);
 
   MessagePortMessageFilter* NewMessagePortMessageFilter();
 
-  std::unique_ptr<shell::InterfaceRegistry> CreateInterfaceRegistry(
-      MockRenderProcessHost* rph);
-
   std::unique_ptr<TestBrowserContext> browser_context_;
   std::unique_ptr<MockRenderProcessHost> render_process_host_;
-  std::unique_ptr<MockRenderProcessHost> new_render_process_host_;
 
   scoped_refptr<ServiceWorkerContextWrapper> wrapper_;
 
   IPC::TestSink sink_;
   IPC::TestSink inner_sink_;
 
-  std::vector<std::unique_ptr<MockEmbeddedWorkerInstanceClient>>
-      mock_instance_clients_;
-  size_t mock_instance_clients_next_index_;
-
   int next_thread_id_;
   int mock_render_process_id_;
-  int new_mock_render_process_id_;
 
   std::unique_ptr<shell::InterfaceRegistry> render_process_interface_registry_;
-  std::unique_ptr<shell::InterfaceRegistry>
-      new_render_process_interface_registry_;
 
   std::map<int, int64_t> embedded_worker_id_service_worker_version_id_map_;
 
   // Stores the InterfaceRegistry/InterfaceProviders that are associated with
   // each individual service worker.
   base::hash_map<int, InterfaceRegistryAndProvider>
       thread_id_service_registry_map_;
 
   // Updated each time MessageToWorker message is received.
   int current_embedded_worker_id_;
 
   std::vector<scoped_refptr<MessagePortMessageFilter>>
       message_port_message_filters_;
 
   base::WeakPtrFactory<EmbeddedWorkerTestHelper> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerTestHelper);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_EMBEDDED_WORKER_TEST_HELPER_H_