Define DevTools content API

chrome/browser/debugger/debugger_remote_service.cc

 // Copyright (c) 2011 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.
 
 // This file contains implementations of the DebuggerRemoteService methods,
 // defines DebuggerRemoteService and DebuggerRemoteServiceCommand constants.
 
 #include "chrome/browser/debugger/debugger_remote_service.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/debugger/devtools_protocol_handler.h"
 #include "chrome/browser/debugger/devtools_remote_message.h"
 #include "chrome/browser/debugger/inspectable_tab_proxy.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/render_messages.h"
-#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/devtools_messages.h"
+#include "content/public/browser/devtools/devtools_agent_host_registry.h"
+#include "content/public/browser/devtools/devtools_manager.h"
+
+using content::DevToolsAgentHostRegistry;
+using content::DevToolsManager;
 
 namespace {
 
 // Constants for the "data", "result", and "command" JSON message fields.
 const char kDataKey[] = "data";
 const char kResultKey[] = "result";
 const char kCommandKey[] = "command";
 
 }  // namespace
 
@@ skipping 179 matching lines @@
     return;
   }
   RenderViewHost* target_host = tab_contents->render_view_host();
   DevToolsClientHost* client_host =
       delegate_->inspectable_tab_proxy()->ClientHostForTabId(tab_uid);
   if (client_host == NULL) {
     client_host =
         delegate_->inspectable_tab_proxy()->NewClientHost(tab_uid, this);
     DevToolsManager* manager = DevToolsManager::GetInstance();
     if (manager != NULL) {
-      manager->RegisterDevToolsClientHostFor(target_host, client_host);
+      DevToolsAgentHost* agent =
+          DevToolsAgentHostRegistry::GetDevToolsAgentHost(target_host);
+      manager->RegisterDevToolsClientHostFor(agent, client_host);
       response->SetInteger(kResultKey, RESULT_OK);
     } else {
       response->SetInteger(kResultKey, RESULT_DEBUGGER_ERROR);
     }
   } else {
     // DevToolsClientHost for this tab is already registered
     response->SetInteger(kResultKey, RESULT_ILLEGAL_TAB_STATE);
   }
 }
 
@@ skipping 42 matching lines @@
   if (manager == NULL) {
     response->SetInteger(kResultKey, RESULT_DEBUGGER_ERROR);
     return true;
   }
   TabContents* tab_contents = ToTabContents(tab_uid);
   if (tab_contents == NULL) {
     // Unknown tab_uid from remote debugger
     response->SetInteger(kResultKey, RESULT_UNKNOWN_TAB);
     return true;
   }
-  DevToolsClientHost* client_host =
-      manager->GetDevToolsClientHostFor(tab_contents->render_view_host());
+  DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost(
+      tab_contents->render_view_host());
+  DevToolsClientHost* client_host = manager->GetDevToolsClientHostFor(agent);
   if (client_host == NULL) {
     // tab_uid is not being debugged (Attach has not been invoked)
     response->SetInteger(kResultKey, RESULT_ILLEGAL_TAB_STATE);
     return true;
   }
   std::string v8_command;
   DictionaryValue* v8_command_value;
   content->GetDictionary(kDataKey, &v8_command_value);
   base::JSONWriter::Write(v8_command_value, false, &v8_command);
   manager->ForwardToDevToolsAgent(
@@ skipping 27 matching lines @@
     // No RenderViewHost
     response->SetInteger(kResultKey, RESULT_UNKNOWN_TAB);
     return true;
   }
   std::string javascript;
   content->GetString(kDataKey, &javascript);
   render_view_host->ExecuteJavascriptInWebFrame(string16(),
                                                 UTF8ToUTF16(javascript));
   return false;
 }