Split EmbeddedWorkerDevToolsManager into two for Shared- and ServiceWorker

content/browser/devtools/service_worker_devtools_manager.cc

Index: content/browser/devtools/service_worker_devtools_manager.cc
diff --git a/content/browser/devtools/embedded_worker_devtools_manager.cc b/content/browser/devtools/service_worker_devtools_manager.cc
similarity index 31%
rename from content/browser/devtools/embedded_worker_devtools_manager.cc
rename to content/browser/devtools/service_worker_devtools_manager.cc
index f51cd2b88ed9d5ccf0a3c0d9bf60be876230668b..18b3eb56ff54cb94c24c70a0f524120f66a502de 100644
--- a/content/browser/devtools/embedded_worker_devtools_manager.cc
+++ b/content/browser/devtools/service_worker_devtools_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/devtools/embedded_worker_devtools_manager.h"
+#include "content/browser/devtools/service_worker_devtools_manager.h"
 
 #include "content/browser/devtools/devtools_manager.h"
 #include "content/browser/devtools/ipc_devtools_agent_host.h"
@@ -17,16 +17,7 @@
 
 namespace content {
 
-// Called on the UI thread.
-// static
-scoped_refptr<DevToolsAgentHost> DevToolsAgentHost::GetForWorker(
-    int worker_process_id,
-    int worker_route_id) {
-  return EmbeddedWorkerDevToolsManager::GetInstance()
-      ->GetDevToolsAgentHostForWorker(worker_process_id, worker_route_id);
-}
-
-EmbeddedWorkerDevToolsManager::ServiceWorkerIdentifier::ServiceWorkerIdentifier(
+ServiceWorkerDevToolsManager::ServiceWorkerIdentifier::ServiceWorkerIdentifier(
     const ServiceWorkerContextCore* context,
     base::WeakPtr<ServiceWorkerContextCore> context_weak,
     int64 version_id,
@@ -37,7 +28,7 @@ EmbeddedWorkerDevToolsManager::ServiceWorkerIdentifier::ServiceWorkerIdentifier(
       url_(url) {
 }
 
-EmbeddedWorkerDevToolsManager::ServiceWorkerIdentifier::ServiceWorkerIdentifier(
+ServiceWorkerDevToolsManager::ServiceWorkerIdentifier::ServiceWorkerIdentifier(
     const ServiceWorkerIdentifier& other)
     : context_(other.context_),
       context_weak_(other.context_weak_),
@@ -45,169 +36,62 @@ EmbeddedWorkerDevToolsManager::ServiceWorkerIdentifier::ServiceWorkerIdentifier(
       url_(other.url_) {
 }
 
-EmbeddedWorkerDevToolsManager::
+ServiceWorkerDevToolsManager::
 ServiceWorkerIdentifier::~ServiceWorkerIdentifier() {
 }
 
-bool EmbeddedWorkerDevToolsManager::ServiceWorkerIdentifier::Matches(
+bool ServiceWorkerDevToolsManager::ServiceWorkerIdentifier::Matches(
     const ServiceWorkerIdentifier& other) const {
   return context_ == other.context_ && version_id_ == other.version_id_;
 }
 
-const ServiceWorkerContextCore*
-EmbeddedWorkerDevToolsManager::ServiceWorkerIdentifier::context() const {
-  return context_;
-}
-
-base::WeakPtr<ServiceWorkerContextCore>
-EmbeddedWorkerDevToolsManager::ServiceWorkerIdentifier::context_weak() const {
-  return context_weak_;
-}
-
-int64
-EmbeddedWorkerDevToolsManager::ServiceWorkerIdentifier::version_id() const {
-  return version_id_;
-}
-
-GURL EmbeddedWorkerDevToolsManager::ServiceWorkerIdentifier::url() const {
-  return url_;
-}
-
 // static
-EmbeddedWorkerDevToolsManager* EmbeddedWorkerDevToolsManager::GetInstance() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  return Singleton<EmbeddedWorkerDevToolsManager>::get();
-}
-
-DevToolsAgentHostImpl*
-EmbeddedWorkerDevToolsManager::GetDevToolsAgentHostForWorker(
-    int worker_process_id,
-    int worker_route_id) {
-  AgentHostMap::iterator it = workers_.find(
-      WorkerId(worker_process_id, worker_route_id));
-  return it == workers_.end() ? NULL : it->second;
-}
-
-EmbeddedWorkerDevToolsManager::EmbeddedWorkerDevToolsManager()
-    : debug_service_worker_on_start_(false) {
-}
-
-EmbeddedWorkerDevToolsManager::~EmbeddedWorkerDevToolsManager() {
-}
-
-bool EmbeddedWorkerDevToolsManager::SharedWorkerCreated(
-    int worker_process_id,
-    int worker_route_id,
-    const SharedWorkerInstance& instance) {
+ServiceWorkerDevToolsManager* ServiceWorkerDevToolsManager::GetInstance() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  const WorkerId id(worker_process_id, worker_route_id);
-  AgentHostMap::iterator it = FindExistingSharedWorkerAgentHost(instance);
-  if (it == workers_.end()) {
-    workers_[id] = new SharedWorkerDevToolsAgentHost(id, instance);
-    DevToolsManager::GetInstance()->AgentHostChanged(workers_[id]);
-    return false;
-  }
-  WorkerRestarted(id, it);
-  return true;
+  return Singleton<ServiceWorkerDevToolsManager>::get();
 }
 
-bool EmbeddedWorkerDevToolsManager::ServiceWorkerCreated(
+bool ServiceWorkerDevToolsManager::WorkerCreated(
     int worker_process_id,
     int worker_route_id,
     const ServiceWorkerIdentifier& service_worker_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const WorkerId id(worker_process_id, worker_route_id);
-  AgentHostMap::iterator it =
-      FindExistingServiceWorkerAgentHost(service_worker_id);
-  if (it == workers_.end()) {
-    workers_[id] = new ServiceWorkerDevToolsAgentHost(
+  AgentHostMap::iterator it = FindExistingWorkerAgentHost(service_worker_id);
+  if (it == workers().end()) {
+    workers()[id] = new ServiceWorkerDevToolsAgentHost(
         id, service_worker_id, debug_service_worker_on_start_);
-    DevToolsManager::GetInstance()->AgentHostChanged(workers_[id]);
+    DevToolsManager::GetInstance()->AgentHostChanged(workers()[id]);
     return debug_service_worker_on_start_;
   }
   WorkerRestarted(id, it);
   return true;
 }
 
-void EmbeddedWorkerDevToolsManager::WorkerDestroyed(int worker_process_id,
-                                                    int worker_route_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  const WorkerId id(worker_process_id, worker_route_id);
-  AgentHostMap::iterator it = workers_.find(id);
-  DCHECK(it != workers_.end());
-  scoped_refptr<EmbeddedWorkerDevToolsAgentHost> agent_host(it->second);
-  agent_host->WorkerDestroyed();
-  DevToolsManager::GetInstance()->AgentHostChanged(agent_host);
-}
-
-void EmbeddedWorkerDevToolsManager::WorkerStopIgnored(int worker_process_id,
+void ServiceWorkerDevToolsManager::WorkerStopIgnored(int worker_process_id,
                                                       int worker_route_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // TODO(pfeldman): Show a console message to tell the user that UA didn't
   // terminate the worker because devtools is attached.
 }
 
-void EmbeddedWorkerDevToolsManager::WorkerReadyForInspection(
-    int worker_process_id,
-    int worker_route_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  const WorkerId id(worker_process_id, worker_route_id);
-  AgentHostMap::iterator it = workers_.find(id);
-  DCHECK(it != workers_.end());
-  it->second->WorkerReadyForInspection();
-}
-
-void EmbeddedWorkerDevToolsManager::RemoveInspectedWorkerData(WorkerId id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  workers_.erase(id);
+ServiceWorkerDevToolsManager::ServiceWorkerDevToolsManager()
+    : debug_service_worker_on_start_(false) {
 }
 
-EmbeddedWorkerDevToolsManager::AgentHostMap::iterator
-EmbeddedWorkerDevToolsManager::FindExistingSharedWorkerAgentHost(
-    const SharedWorkerInstance& instance) {
-  AgentHostMap::iterator it = workers_.begin();
-  for (; it != workers_.end(); ++it) {
-    if (it->second->Matches(instance))
-      break;
-  }
-  return it;
+ServiceWorkerDevToolsManager::~ServiceWorkerDevToolsManager() {
 }
 
-EmbeddedWorkerDevToolsManager::AgentHostMap::iterator
-EmbeddedWorkerDevToolsManager::FindExistingServiceWorkerAgentHost(
+ServiceWorkerDevToolsManager::AgentHostMap::iterator
+ServiceWorkerDevToolsManager::FindExistingWorkerAgentHost(
     const ServiceWorkerIdentifier& service_worker_id) {
-  AgentHostMap::iterator it = workers_.begin();
-  for (; it != workers_.end(); ++it) {
-    if (it->second->Matches(service_worker_id))
+  AgentHostMap::iterator it = workers().begin();
+  for (; it != workers().end(); ++it) {
+    if (static_cast<ServiceWorkerDevToolsAgentHost*>(
+            it->second)->Matches(service_worker_id))
       break;
   }
   return it;
 }
 
-DevToolsAgentHost::List
-EmbeddedWorkerDevToolsManager::GetOrCreateAllAgentHosts() {
-  DevToolsAgentHost::List result;
-  EmbeddedWorkerDevToolsManager* instance = GetInstance();
-  for (AgentHostMap::iterator it = instance->workers_.begin();
-      it != instance->workers_.end(); ++it) {
-    if (!it->second->IsTerminated())
-      result.push_back(it->second);
-  }
-  return result;
-}
-
-void EmbeddedWorkerDevToolsManager::WorkerRestarted(
-    const WorkerId& id,
-    const AgentHostMap::iterator& it) {
-  EmbeddedWorkerDevToolsAgentHost* agent_host = it->second;
-  agent_host->WorkerRestarted(id);
-  workers_.erase(it);
-  workers_[id] = agent_host;
-  DevToolsManager::GetInstance()->AgentHostChanged(agent_host);
-}
-
-void EmbeddedWorkerDevToolsManager::ResetForTesting() {
-  workers_.clear();
-}
-
 }  // namespace content