[DevTools] Make DevTools clients talk directly to DevToolsAgentHost instead of using DevToolsManage…

content/browser/devtools/embedded_worker_devtools_manager.cc

 // 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.
 
 #include "content/browser/devtools/embedded_worker_devtools_manager.h"
 
 #include "content/browser/devtools/devtools_manager_impl.h"
 #include "content/browser/devtools/devtools_protocol.h"
 #include "content/browser/devtools/devtools_protocol_constants.h"
 #include "content/browser/devtools/ipc_devtools_agent_host.h"
@@ skipping 133 matching lines @@
 
   void DetachFromWorker() {
     if (!worker_attached_)
       return;
     worker_attached_ = false;
     if (RenderProcessHost* host = RenderProcessHost::FromID(worker_id_.first))
       host->RemoveRoute(worker_id_.second);
     Release();
   }
 
+  void SendDisconnectedNotification() {
+    SendMessageToClient(DevToolsProtocol::CreateNotification(
+        devtools::Worker::disconnectedFromWorker::kName, NULL)->Serialize());
+  }
+
   WorkerId worker_id() const { return worker_id_; }
 
  private:
   virtual ~EmbeddedWorkerDevToolsAgentHost() {
     CHECK(!worker_attached_);
     EmbeddedWorkerDevToolsManager::GetInstance()->RemoveInspectedWorkerData(
         this);
   }
 
   void OnDispatchOnInspectorFrontend(const std::string& message) {
-    DevToolsManagerImpl::GetInstance()->DispatchOnInspectorFrontend(this,
-                                                                    message);
+    SendMessageToClient(message);
   }
 
   void OnSaveAgentRuntimeState(const std::string& state) { state_ = state; }
 
   void AttachToWorker() {
     if (worker_attached_)
       return;
     worker_attached_ = true;
     AddRef();
     if (RenderProcessHost* host = RenderProcessHost::FromID(worker_id_.first))
       host->AddRoute(worker_id_.second, this);
   }
 
   WorkerId worker_id_;
   bool worker_attached_;
   std::string state_;
   DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerDevToolsAgentHost);
 };
 
 // static
 EmbeddedWorkerDevToolsManager* EmbeddedWorkerDevToolsManager::GetInstance() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return Singleton<EmbeddedWorkerDevToolsManager>::get();
 }
 
-DevToolsAgentHost* EmbeddedWorkerDevToolsManager::GetDevToolsAgentHostForWorker(
+DevToolsAgentHostImpl*
+EmbeddedWorkerDevToolsManager::GetDevToolsAgentHostForWorker(
     int worker_process_id,
     int worker_route_id) {
   WorkerId id(worker_process_id, worker_route_id);
 
   WorkerInfoMap::iterator it = workers_.find(id);
   if (it == workers_.end())
     return NULL;
 
   WorkerInfo* info = it->second;
   if (info->state() != WORKER_UNINSPECTED &&
       info->state() != WORKER_PAUSED_FOR_DEBUG_ON_START) {
     return info->agent_host();
   }
 
   EmbeddedWorkerDevToolsAgentHost* agent_host =
       new EmbeddedWorkerDevToolsAgentHost(id);
   info->set_agent_host(agent_host);
   info->set_state(WORKER_INSPECTED);
   return agent_host;
 }
 
-DevToolsAgentHost*
+DevToolsAgentHostImpl*
 EmbeddedWorkerDevToolsManager::GetDevToolsAgentHostForServiceWorker(
     const ServiceWorkerIdentifier& service_worker_id) {
   WorkerInfoMap::iterator it = FindExistingServiceWorkerInfo(service_worker_id);
   if (it == workers_.end())
     return NULL;
   return GetDevToolsAgentHostForWorker(it->first.first, it->first.second);
 }
 
 EmbeddedWorkerDevToolsManager::EmbeddedWorkerDevToolsManager()
     : debug_service_worker_on_start_(false) {
@@ skipping 49 matching lines @@
       workers_.erase(it);
       break;
     case WORKER_INSPECTED: {
       EmbeddedWorkerDevToolsAgentHost* agent_host = info->agent_host();
       info->set_state(WORKER_TERMINATED);
       if (!agent_host->IsAttached()) {
         agent_host->DetachFromWorker();
         return;
       }
       // Client host is debugging this worker agent host.
-      std::string notification =
-          DevToolsProtocol::CreateNotification(
-              devtools::Worker::disconnectedFromWorker::kName, NULL)
-              ->Serialize();
-      DevToolsManagerImpl::GetInstance()->DispatchOnInspectorFrontend(
-          agent_host, notification);
+      agent_host->SendDisconnectedNotification();
       agent_host->DetachFromWorker();
       break;
     }
     case WORKER_TERMINATED:
       NOTREACHED();
       break;
     case WORKER_PAUSED_FOR_REATTACH: {
       scoped_ptr<WorkerInfo> worker_info = workers_.take_and_erase(it);
       worker_info->set_state(WORKER_TERMINATED);
       const WorkerId old_id = worker_info->agent_host()->worker_id();
       workers_.set(old_id, worker_info.Pass());
       break;
     }
   }
 }
 
 void EmbeddedWorkerDevToolsManager::WorkerContextStarted(int worker_process_id,
                                                          int worker_route_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const WorkerId id(worker_process_id, worker_route_id);
   WorkerInfoMap::iterator it = workers_.find(id);
   DCHECK(it != workers_.end());
   WorkerInfo* info = it->second;
   if (info->state() == WORKER_PAUSED_FOR_DEBUG_ON_START) {
     RenderProcessHost* rph = RenderProcessHost::FromID(worker_process_id);
-    scoped_refptr<DevToolsAgentHost> agent_host(
+    scoped_refptr<DevToolsAgentHostImpl> agent_host(
         GetDevToolsAgentHostForWorker(worker_process_id, worker_route_id));
-    DevToolsManagerImpl::GetInstance()->Inspect(rph->GetBrowserContext(),
-                                                agent_host.get());
+    agent_host->Inspect(rph->GetBrowserContext());
   } else if (info->state() == WORKER_PAUSED_FOR_REATTACH) {
     info->agent_host()->ReattachToWorker(id);
     info->set_state(WORKER_INSPECTED);
   }
 }
 
 void EmbeddedWorkerDevToolsManager::RemoveInspectedWorkerData(
     EmbeddedWorkerDevToolsAgentHost* agent_host) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const WorkerId id(agent_host->worker_id());
@@ skipping 51 matching lines @@
   scoped_ptr<WorkerInfo> info = workers_.take_and_erase(it);
   info->set_state(WORKER_PAUSED_FOR_REATTACH);
   workers_.set(id, info.Pass());
 }
 
 void EmbeddedWorkerDevToolsManager::ResetForTesting() {
   workers_.clear();
 }
 
 }  // namespace content