Split EmbeddedWorkerDevToolsManager into two for Shared- and ServiceWorker

content/browser/devtools/service_worker_devtools_manager.h

Index: content/browser/devtools/service_worker_devtools_manager.h
diff --git a/content/browser/devtools/embedded_worker_devtools_manager.h b/content/browser/devtools/service_worker_devtools_manager.h
similarity index 39%
rename from content/browser/devtools/embedded_worker_devtools_manager.h
rename to content/browser/devtools/service_worker_devtools_manager.h
index 694139ff0ef8dfa9425733b59c30bd0665222c20..3024e593896fe55bd5601fcc765eef2f27a58b83 100644
--- a/content/browser/devtools/embedded_worker_devtools_manager.h
+++ b/content/browser/devtools/service_worker_devtools_manager.h
@@ -2,34 +2,27 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_
-#define CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_
+#ifndef CONTENT_BROWSER_DEVTOOLS_SERVICE_WORKER_DEVTOOLS_MANAGER_H_
+#define CONTENT_BROWSER_DEVTOOLS_SERVICE_WORKER_DEVTOOLS_MANAGER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
-#include "base/gtest_prod_util.h"
-#include "base/memory/scoped_vector.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
-#include "base/strings/string16.h"
+#include "content/browser/devtools/worker_devtools_manager.h"
 #include "content/browser/shared_worker/shared_worker_instance.h"
-#include "content/common/content_export.h"
 
 namespace content {
 
-class DevToolsAgentHost;
-class DevToolsAgentHostImpl;
-class EmbeddedWorkerDevToolsAgentHost;
+class ServiceWorkerDevToolsAgentHost;
 class ServiceWorkerContextCore;
 
-// EmbeddedWorkerDevToolsManager is used instead of WorkerDevToolsManager when
-// "enable-embedded-shared-worker" flag is set.
+// Manages WorkerDevToolsAgentHost's for Service Workers.
 // This class lives on UI thread.
-class CONTENT_EXPORT EmbeddedWorkerDevToolsManager {
+class CONTENT_EXPORT ServiceWorkerDevToolsManager
+    : public WorkerDevToolsManager {
  public:
-  typedef std::pair<int, int> WorkerId;
-
   class ServiceWorkerIdentifier {
    public:
     ServiceWorkerIdentifier(
@@ -42,10 +35,12 @@ class CONTENT_EXPORT EmbeddedWorkerDevToolsManager {
 
     bool Matches(const ServiceWorkerIdentifier& other) const;
 
-    const ServiceWorkerContextCore* context() const;
-    base::WeakPtr<ServiceWorkerContextCore> context_weak() const;
-    int64 version_id() const;
-    GURL url() const;
+    const ServiceWorkerContextCore* context() const { return context_; }
+    base::WeakPtr<ServiceWorkerContextCore> context_weak() const {
+      return context_weak_;
+    }
+    int64 version_id() const { return version_id_; }
+    GURL url() const { return url_; }
 
    private:
     const ServiceWorkerContextCore* const context_;
@@ -54,27 +49,15 @@ class CONTENT_EXPORT EmbeddedWorkerDevToolsManager {
     const GURL url_;
   };
 
-  // Returns the EmbeddedWorkerDevToolsManager singleton.
-  static EmbeddedWorkerDevToolsManager* GetInstance();
-
-  DevToolsAgentHostImpl* GetDevToolsAgentHostForWorker(int worker_process_id,
-                                                   int worker_route_id);
-
-  std::vector<scoped_refptr<DevToolsAgentHost> > GetOrCreateAllAgentHosts();
+  // Returns the ServiceWorkerDevToolsManager singleton.
+  static ServiceWorkerDevToolsManager* GetInstance();
 
   // Returns true when the worker must be paused on start because a DevTool
-  // window for the same former SharedWorkerInstance is still opened.
-  bool SharedWorkerCreated(int worker_process_id,
-                           int worker_route_id,
-                           const SharedWorkerInstance& instance);
-  // Returns true when the worker must be paused on start because a DevTool
   // window for the same former ServiceWorkerIdentifier is still opened or
   // debug-on-start is enabled in chrome://serviceworker-internals.
-  bool ServiceWorkerCreated(int worker_process_id,
-                            int worker_route_id,
-                            const ServiceWorkerIdentifier& service_worker_id);
-  void WorkerReadyForInspection(int worker_process_id, int worker_route_id);
-  void WorkerDestroyed(int worker_process_id, int worker_route_id);
+  bool WorkerCreated(int worker_process_id,
+                     int worker_route_id,
+                     const ServiceWorkerIdentifier& service_worker_id);
   void WorkerStopIgnored(int worker_process_id, int worker_route_id);
 
   void set_debug_service_worker_on_start(bool debug_on_start) {
@@ -85,36 +68,20 @@ class CONTENT_EXPORT EmbeddedWorkerDevToolsManager {
   }
 
  private:
-  friend struct DefaultSingletonTraits<EmbeddedWorkerDevToolsManager>;
-  friend class EmbeddedWorkerDevToolsAgentHost;
-  friend class EmbeddedWorkerDevToolsManagerTest;
-  FRIEND_TEST_ALL_PREFIXES(EmbeddedWorkerDevToolsManagerTest, BasicTest);
-  FRIEND_TEST_ALL_PREFIXES(EmbeddedWorkerDevToolsManagerTest, AttachTest);
-
-  typedef std::map<WorkerId, EmbeddedWorkerDevToolsAgentHost*> AgentHostMap;
+  friend struct DefaultSingletonTraits<ServiceWorkerDevToolsManager>;
+  friend class ServiceWorkerDevToolsAgentHost;
 
-  EmbeddedWorkerDevToolsManager();
-  virtual ~EmbeddedWorkerDevToolsManager();
+  ServiceWorkerDevToolsManager();
+  ~ServiceWorkerDevToolsManager() override;
 
-  void RemoveInspectedWorkerData(WorkerId id);
-
-  AgentHostMap::iterator FindExistingSharedWorkerAgentHost(
-      const SharedWorkerInstance& instance);
-  AgentHostMap::iterator FindExistingServiceWorkerAgentHost(
+  AgentHostMap::iterator FindExistingWorkerAgentHost(
       const ServiceWorkerIdentifier& service_worker_id);
 
-  void WorkerRestarted(const WorkerId& id, const AgentHostMap::iterator& it);
-
-  // Resets to its initial state as if newly created.
-  void ResetForTesting();
-
-  AgentHostMap workers_;
-
   bool debug_service_worker_on_start_;
 
-  DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerDevToolsManager);
+  DISALLOW_COPY_AND_ASSIGN(ServiceWorkerDevToolsManager);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_
+#endif  // CONTENT_BROWSER_DEVTOOLS_SERVICE_WORKER_DEVTOOLS_MANAGER_H_