[ServiceWorker] Remove some unused code from EmbeddedWorkerTestHelper

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/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
 #include "base/time/time.h"
 #include "content/common/service_worker/embedded_worker.mojom.h"
 #include "content/common/service_worker/service_worker_event_dispatcher.mojom.h"
 #include "content/common/service_worker/service_worker_status_code.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_test_sink.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "net/http/http_response_info.h"
-#include "services/service_manager/public/cpp/interface_provider.h"
-#include "services/service_manager/public/cpp/interface_registry.h"
-#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
-#include "testing/gtest/include/gtest/gtest.h"

[falken, 2016/12/28 09:54:09]

Doesn't look right to remove gtest.h

[leonhsl(Using Gerrit), 2016/12/29 02:33:43]

Seems embedded_worker_test_helper.h does not use anything defined in gtest.h, so
I removed it, and embedded_worker_test_helper.cc is including gtest.h.

 #include "url/gurl.h"
 
 class GURL;
 
 namespace service_manager {
-class InterfaceProvider;
 class InterfaceRegistry;
 }
 
 namespace content {
 
 class EmbeddedWorkerRegistry;
 class EmbeddedWorkerTestHelper;
 class MessagePortMessageFilter;
 class MockRenderProcessHost;
 class ServiceWorkerContextCore;
@@ skipping 160 matching lines @@
   void SimulateWorkerScriptLoaded(int embedded_worker_id);
   void SimulateWorkerThreadStarted(int thread_id, int embedded_worker_id);
   void SimulateWorkerScriptEvaluated(int embedded_worker_id, bool success);
   void SimulateWorkerStarted(int embedded_worker_id);
   void SimulateWorkerStopped(int embedded_worker_id);
   void SimulateSend(IPC::Message* message);
 
   EmbeddedWorkerRegistry* registry();
 
  private:
-  using InterfaceRegistryAndProvider =
-      std::pair<std::unique_ptr<service_manager::InterfaceRegistry>,
-                std::unique_ptr<service_manager::InterfaceProvider>>;
-
   class MockEmbeddedWorkerSetup;
   class MockServiceWorkerEventDispatcher;
 
   void OnStartWorkerStub(const EmbeddedWorkerStartParams& 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);
@@ skipping 33 matching lines @@
 
   std::unique_ptr<service_manager::InterfaceRegistry>
       render_process_interface_registry_;
   std::unique_ptr<service_manager::InterfaceRegistry>
       new_render_process_interface_registry_;
 
   std::map<int, int64_t> embedded_worker_id_service_worker_version_id_map_;
   std::map<int /* thread_id */, int /* embedded_worker_id */>
       thread_id_embedded_worker_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);
 };
 
 template <typename MockType, typename... Args>
 MockType* EmbeddedWorkerTestHelper::CreateAndRegisterMockInstanceClient(
     Args&&... args) {
   std::unique_ptr<MockType> mock =
       base::MakeUnique<MockType>(std::forward<Args>(args)...);
   MockType* mock_rawptr = mock.get();
   RegisterMockInstanceClient(std::move(mock));
   return mock_rawptr;
 }
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_EMBEDDED_WORKER_TEST_HELPER_H_