DevTools: remove the WorkerDevToolsManager base - implementations are diverging.

content/browser/devtools/shared_worker_devtools_manager.h

Index: content/browser/devtools/shared_worker_devtools_manager.h
diff --git a/content/browser/devtools/shared_worker_devtools_manager.h b/content/browser/devtools/shared_worker_devtools_manager.h
index 4d6c61645f3c4a81c118ceb73ee3469a2bb63193..4e5af855ac93cabfefac6ec7fbd87cf4c4644889 100644
--- a/content/browser/devtools/shared_worker_devtools_manager.h
+++ b/content/browser/devtools/shared_worker_devtools_manager.h
@@ -5,29 +5,40 @@
 #ifndef CONTENT_BROWSER_DEVTOOLS_SHARED_WORKER_DEVTOOLS_MANAGER_H_
 #define CONTENT_BROWSER_DEVTOOLS_SHARED_WORKER_DEVTOOLS_MANAGER_H_
 
+#include <map>
+
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/singleton.h"
-#include "content/browser/devtools/worker_devtools_manager.h"
+#include "content/public/browser/devtools_agent_host.h"
 
 namespace content {
 
+class DevToolsAgentHostImpl;
 class SharedWorkerDevToolsAgentHost;
 class SharedWorkerInstance;
 
 // Manages WorkerDevToolsAgentHost's for Shared Workers.
 // This class lives on UI thread.
-class CONTENT_EXPORT SharedWorkerDevToolsManager
-    : public WorkerDevToolsManager {
+class CONTENT_EXPORT SharedWorkerDevToolsManager {
  public:
+  typedef std::pair<int, int> WorkerId;
+
   // Returns the SharedWorkerDevToolsManager singleton.
   static SharedWorkerDevToolsManager* GetInstance();
 
+  DevToolsAgentHostImpl* GetDevToolsAgentHostForWorker(int worker_process_id,

[dgozman, 2015/03/07 20:46:40]

SharedWorkerDevToolsAgentHost*

[pfeldman, 2015/03/08 12:17:28]

Clients don't need it to be that specific, you only force them to add more
includes.

+                                                       int worker_route_id);
+  void AddAllAgentHosts(DevToolsAgentHost::List* result);
+
   // Returns true when the worker must be paused on start because a DevTool
   // window for the same former SharedWorkerInstance is still opened.
   bool WorkerCreated(int worker_process_id,
                      int worker_route_id,
                      const SharedWorkerInstance& instance);
+  void WorkerReadyForInspection(int worker_process_id, int worker_route_id);

[dgozman, 2015/03/07 20:46:40]

Same comment regarding public vs. private.

[pfeldman, 2015/03/08 12:17:28]

Ditto

+  void WorkerDestroyed(int worker_process_id, int worker_route_id);
+  void RemoveInspectedWorkerData(WorkerId id);
 
  private:
   friend struct DefaultSingletonTraits<SharedWorkerDevToolsManager>;
@@ -36,12 +47,18 @@ class CONTENT_EXPORT SharedWorkerDevToolsManager
   FRIEND_TEST_ALL_PREFIXES(SharedWorkerDevToolsManagerTest, BasicTest);
   FRIEND_TEST_ALL_PREFIXES(SharedWorkerDevToolsManagerTest, AttachTest);
 
+  using AgentHostMap = std::map<WorkerId, SharedWorkerDevToolsAgentHost*>;
+
   SharedWorkerDevToolsManager();
-  ~SharedWorkerDevToolsManager() override;
+  ~SharedWorkerDevToolsManager();
 
   AgentHostMap::iterator FindExistingWorkerAgentHost(
       const SharedWorkerInstance& instance);
 
+  // Resets to its initial state as if newly created.
+  void ResetForTesting();
+
+  AgentHostMap workers_;
   DISALLOW_COPY_AND_ASSIGN(SharedWorkerDevToolsManager);
 };