[DevTools] Move DevToolsClientHost functionality out of DevToolsFrontendHost.

chrome/browser/devtools/devtools_window.cc

Index: chrome/browser/devtools/devtools_window.cc
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index 1a6962f43a4704ca50e95b82e1a483ca6319c52f..0dd6dbbc1b6ac44318f101c7e786dd2b2e043b59 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -427,7 +427,7 @@ DevToolsWindow* DevToolsWindow::OpenDevToolsWindowForWorker(
     window = DevToolsWindow::CreateDevToolsWindowForWorker(profile);
     // Will disconnect the current client host if there is one.
     content::DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
-        worker_agent, window->bindings_->frontend_host());
+        worker_agent, window->bindings_);
   }
   window->ScheduleShow(DevToolsToggleAction::Show());
   return window;
@@ -479,7 +479,7 @@ void DevToolsWindow::OpenExternalFrontend(
     window = Create(profile, DevToolsUI::GetProxyURL(frontend_url), NULL,
                     false, true, false, "");
     content::DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
-        agent_host, window->bindings_->frontend_host());
+        agent_host, window->bindings_);
   }
   window->ScheduleShow(DevToolsToggleAction::Show());
 }
@@ -502,8 +502,7 @@ DevToolsWindow* DevToolsWindow::ToggleDevToolsWindow(
         base::UserMetricsAction("DevTools_InspectRenderer"));
     window = Create(
         profile, GURL(), inspected_rvh, false, false, true, settings);
-    manager->RegisterDevToolsClientHostFor(agent.get(),
-                                           window->bindings_->frontend_host());
+    manager->RegisterDevToolsClientHostFor(agent.get(), window->bindings_);
     do_open = true;
   }
 
@@ -799,8 +798,7 @@ DevToolsWindow* DevToolsWindow::FindDevToolsWindow(
   content::DevToolsManager* manager = content::DevToolsManager::GetInstance();
   for (DevToolsWindows::iterator it(instances->begin()); it != instances->end();
        ++it) {
-    if (manager->GetDevToolsAgentHostFor((*it)->bindings_->frontend_host()) ==
-        agent_host)
+    if (manager->GetDevToolsAgentHostFor((*it)->bindings_) == agent_host)
       return *it;
   }
   return NULL;
@@ -832,12 +830,12 @@ WebContents* DevToolsWindow::OpenURLFromTab(
 
   content::DevToolsManager* manager = content::DevToolsManager::GetInstance();
   scoped_refptr<DevToolsAgentHost> agent_host(
-      manager->GetDevToolsAgentHostFor(bindings_->frontend_host()));
+      manager->GetDevToolsAgentHostFor(bindings_));
   if (!agent_host.get())
     return NULL;
-  manager->ClientHostClosing(bindings_->frontend_host());
+  manager->ClientHostClosing(bindings_);
   manager->RegisterDevToolsClientHostFor(agent_host.get(),
-                                         bindings_->frontend_host());
+                                         bindings_);
 
   content::NavigationController::LoadURLParams load_url_params(params.url);
   main_web_contents_->GetController().LoadURLWithParams(load_url_params);
@@ -916,7 +914,7 @@ void DevToolsWindow::BeforeUnloadFired(WebContents* tab,
     // Docked devtools window closed directly.
     if (proceed) {
       content::DevToolsManager::GetInstance()->ClientHostClosing(
-          bindings_->frontend_host());
+          bindings_);
     }
     *proceed_to_fire_unload = proceed;
   } else {