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

chrome/browser/devtools/devtools_ui_bindings.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 "chrome/browser/devtools/devtools_ui_bindings.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "chrome/common/url_constants.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
-#include "content/public/browser/devtools_client_host.h"
-#include "content/public/browser/devtools_manager.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
@@ skipping 209 matching lines @@
 void DevToolsUIBindings::FrontendWebContentsObserver::WebContentsDestroyed() {
   delete devtools_bindings_;
 }
 
 void DevToolsUIBindings::FrontendWebContentsObserver::RenderProcessGone(
     base::TerminationStatus status) {
   switch (status) {
     case base::TERMINATION_STATUS_ABNORMAL_TERMINATION:
     case base::TERMINATION_STATUS_PROCESS_WAS_KILLED:
     case base::TERMINATION_STATUS_PROCESS_CRASHED:
-      content::DevToolsManager::GetInstance()->ClientHostClosing(
-          devtools_bindings_);
+      if (devtools_bindings_->agent_host_)
+        devtools_bindings_->agent_host_->DetachClient();
       break;
     default:
       break;
   }
   devtools_bindings_->delegate_->RenderProcessGone();
 }
 
 void DevToolsUIBindings::FrontendWebContentsObserver::AboutToNavigateRenderView(
     content::RenderViewHost* render_view_host) {
   content::NavigationEntry* entry =
@@ skipping 68 matching lines @@
   registrar_.Add(
       this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
       content::Source<ThemeService>(
           ThemeServiceFactory::GetForProfile(profile_)));
 
   embedder_message_dispatcher_.reset(
       DevToolsEmbedderMessageDispatcher::createForDevToolsFrontend(this));
 }
 
 DevToolsUIBindings::~DevToolsUIBindings() {
-  content::DevToolsManager::GetInstance()->ClientHostClosing(this);
+  if (agent_host_)
+    agent_host_->DetachClient();
 
   for (IndexingJobsMap::const_iterator jobs_it(indexing_jobs_.begin());
        jobs_it != indexing_jobs_.end(); ++jobs_it) {
     jobs_it->second->Stop();
   }
   indexing_jobs_.clear();
   SetDeviceCountUpdatesEnabled(false);
   SetDevicesUpdatesEnabled(false);
 }
 
@@ skipping 31 matching lines @@
   if (id) {
     base::FundamentalValue id_value(id);
     base::StringValue error_value(error);
     CallClientFunction("InspectorFrontendAPI.embedderMessageAck",
                        &id_value, &error_value, NULL);
   }
 }
 
 void DevToolsUIBindings::HandleMessageFromDevToolsFrontendToBackend(
     const std::string& message) {
-  content::DevToolsManager::GetInstance()->DispatchOnInspectorBackend(
-      this, message);
+  if (agent_host_)
+    agent_host_->DispatchOnInspectorBackend(message);
 }
 
-// content::DevToolsClientHost implementation ---------------------------------
-void DevToolsUIBindings::DispatchOnInspectorFrontend(
-    const std::string& message) {
+// content::DevToolsAgentHost::Client implementation --------------------------
+void DevToolsUIBindings::SendMessageFromAgentHost(
+    content::DevToolsAgentHost* agent_host, const std::string& message) {
+  DCHECK(agent_host == agent_host_.get());
   base::StringValue message_value(message);
   CallClientFunction("InspectorFrontendAPI.dispatchMessage",
                      &message_value, NULL, NULL);
 }
 
-void DevToolsUIBindings::InspectedContentsClosing() {
-  delegate_->InspectedContentsClosing();
-}
-
-void DevToolsUIBindings::ReplacedWithAnotherClient() {
+void DevToolsUIBindings::AgentHostDetached(
+    content::DevToolsAgentHost* agent_host,
+    content::DevToolsAgentHost::DetachReason reason) {
+  DCHECK(agent_host == agent_host_.get());
+  if (reason != content::DevToolsAgentHost::DETACHED_BY_CLIENT)
+    delegate_->InspectedContentsClosing();
 }
 
 // DevToolsEmbedderMessageDispatcher::Delegate implementation -----------------
 void DevToolsUIBindings::ActivateWindow() {
   delegate_->ActivateWindow();
 }
 
 void DevToolsUIBindings::CloseWindow() {
   delegate_->CloseWindow();
 }
@@ skipping 190 matching lines @@
     remote_targets_handler_ = DevToolsTargetsUIHandler::CreateForAdb(
         base::Bind(&DevToolsUIBindings::DevicesUpdated,
                    base::Unretained(this)),
         profile_);
   } else {
     remote_targets_handler_.reset();
   }
 }
 
 void DevToolsUIBindings::SendMessageToBrowser(const std::string& message) {
-  content::DevToolsManager::GetInstance()->DispatchOnInspectorBackend(
-      this, message);
+  if (agent_host_)
+    agent_host_->DispatchOnInspectorBackend(message);
 }
 
 void DevToolsUIBindings::DeviceCountChanged(int count) {
   base::FundamentalValue value(count);
   CallClientFunction("InspectorFrontendAPI.deviceCountUpdated", &value, NULL,
                      NULL);
 }
 
 void DevToolsUIBindings::DevicesUpdated(
     const std::string& source,
@@ skipping 133 matching lines @@
                                 extensions::APIPermission::kExperimental)));
     results.Append(extension_info);
   }
   CallClientFunction("WebInspector.addExtensions", &results, NULL, NULL);
 }
 
 void DevToolsUIBindings::SetDelegate(Delegate* delegate) {
   delegate_.reset(delegate);
 }
 
+void DevToolsUIBindings::InspectAgentHost(
+    content::DevToolsAgentHost* agent_host) {
+  if (agent_host_)
+    agent_host_->DetachClient();
+  agent_host_ = agent_host;
+  if (agent_host_)
+    agent_host_->AttachClient(this);
+}
+
 void DevToolsUIBindings::CallClientFunction(const std::string& function_name,
                                             const base::Value* arg1,
                                             const base::Value* arg2,
                                             const base::Value* arg3) {
   std::string params;
   if (arg1) {
     std::string json;
     base::JSONWriter::Write(arg1, &json);
     params.append(json);
     if (arg2) {
@@ skipping 11 matching lines @@
   web_contents_->GetMainFrame()->ExecuteJavaScript(javascript);
 }
 
 void DevToolsUIBindings::DocumentOnLoadCompletedInMainFrame() {
   // Call delegate first - it seeds importants bit of information.
   delegate_->OnLoadCompleted();
 
   UpdateTheme();
   AddDevToolsExtensionsToClient();
 }