[ServiceWorker] Remove some unused code from EmbeddedWorkerTestHelper

content/browser/service_worker/embedded_worker_test_helper.h

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 6a1216d19f212f8c038c06d572d506ff4b9bca28..108327d1f66b3f185b198b5921e54e7cf8d12e97 100644
--- a/content/browser/service_worker/embedded_worker_test_helper.h
+++ b/content/browser/service_worker/embedded_worker_test_helper.h
@@ -25,16 +25,11 @@
 #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;
 }
 
@@ -215,10 +210,6 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
   EmbeddedWorkerRegistry* registry();
 
  private:
-  using InterfaceRegistryAndProvider =
-      std::pair<std::unique_ptr<service_manager::InterfaceRegistry>,
-                std::unique_ptr<service_manager::InterfaceProvider>>;
-
   class MockEmbeddedWorkerSetup;
   class MockServiceWorkerEventDispatcher;
 
@@ -272,11 +263,6 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
   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_;