DevTools: bulk move of legacy protocol back to chrome/.

Review URL: http://codereview.chromium.org/7458015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93182 0039d316-1c4b-4281-b951-d872f2087c98

30 files changed, 112 insertions, 180 deletions

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 08a3fa4..1233680 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -20,6 +20,8 @@
 #include "chrome/browser/browser_main.h"
 #include "chrome/browser/browser_process_sub_thread.h"
 #include "chrome/browser/browser_trial.h"
+#include "chrome/browser/debugger/browser_list_tabcontents_provider.h"
+#include "chrome/browser/debugger/devtools_protocol_handler.h"
 #include "chrome/browser/download/download_file_manager.h"
 #include "chrome/browser/extensions/extension_event_router_forwarder.h"
 #include "chrome/browser/extensions/extension_tab_id_map.h"
@@ -66,10 +68,8 @@
 #include "content/browser/browser_child_process_host.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/child_process_security_policy.h"
-#include "content/browser/debugger/browser_list_tabcontents_provider.h"
 #include "content/browser/debugger/devtools_http_protocol_handler.h"
 #include "content/browser/debugger/devtools_manager.h"
-#include "content/browser/debugger/devtools_protocol_handler.h"
 #include "content/browser/download/mhtml_generation_manager.h"
 #include "content/browser/download/save_file_manager.h"
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
diff --git a/content/browser/debugger/browser_list_tabcontents_provider.cc b/chrome/browser/debugger/browser_list_tabcontents_provider.cc
index 3214ded..65addd8 100644
--- a/content/browser/debugger/browser_list_tabcontents_provider.cc
+++ b/chrome/browser/debugger/browser_list_tabcontents_provider.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/debugger/browser_list_tabcontents_provider.h"
+#include "chrome/browser/debugger/browser_list_tabcontents_provider.h"
 
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_list.h"
diff --git a/content/browser/debugger/browser_list_tabcontents_provider.h b/chrome/browser/debugger/browser_list_tabcontents_provider.h
index 9649bb3..d8adb9b 100644
--- a/content/browser/debugger/browser_list_tabcontents_provider.h
+++ b/chrome/browser/debugger/browser_list_tabcontents_provider.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_DEBUGGER_BROWSER_LIST_TABCONTENTS_PROVIDER_H_
-#define CONTENT_BROWSER_DEBUGGER_BROWSER_LIST_TABCONTENTS_PROVIDER_H_
+#ifndef CHROME_BROWSER_DEBUGGER_BROWSER_LIST_TABCONTENTS_PROVIDER_H_
+#define CHROME_BROWSER_DEBUGGER_BROWSER_LIST_TABCONTENTS_PROVIDER_H_
 
 #include "content/browser/debugger/devtools_http_protocol_handler.h"
 
-class BrowserListTabContentsProvider :
-    public DevToolsHttpProtocolHandler::TabContentsProvider {
+class BrowserListTabContentsProvider
+    : public DevToolsHttpProtocolHandler::TabContentsProvider {
  public:
   BrowserListTabContentsProvider() {}
   virtual ~BrowserListTabContentsProvider() {}
@@ -18,4 +18,4 @@ class BrowserListTabContentsProvider :
   DISALLOW_COPY_AND_ASSIGN(BrowserListTabContentsProvider);
 };
 
-#endif  // CONTENT_BROWSER_DEBUGGER_BROWSER_LIST_TABCONTENTS_PROVIDER_H_
+#endif  // CHROME_BROWSER_DEBUGGER_BROWSER_LIST_TABCONTENTS_PROVIDER_H_
diff --git a/content/browser/debugger/debugger_remote_service.cc b/chrome/browser/debugger/debugger_remote_service.cc
index d42decc..a93084f 100644
--- a/content/browser/debugger/debugger_remote_service.cc
+++ b/chrome/browser/debugger/debugger_remote_service.cc
@@ -5,7 +5,7 @@
 // This file contains implementations of the DebuggerRemoteService methods,
 // defines DebuggerRemoteService and DebuggerRemoteServiceCommand constants.
 
-#include "content/browser/debugger/debugger_remote_service.h"
+#include "chrome/browser/debugger/debugger_remote_service.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ -13,12 +13,12 @@
 #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/debugger/devtools_protocol_handler.h"
-#include "content/browser/debugger/devtools_remote_message.h"
-#include "content/browser/debugger/inspectable_tab_proxy.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/devtools_messages.h"
diff --git a/content/browser/debugger/debugger_remote_service.h b/chrome/browser/debugger/debugger_remote_service.h
index 3a0bb9c..113fc8f 100644
--- a/content/browser/debugger/debugger_remote_service.h
+++ b/chrome/browser/debugger/debugger_remote_service.h
@@ -5,14 +5,14 @@
 // This file declares the DebuggerRemoteServiceCommand struct and the
 // DebuggerRemoteService class which handles commands directed to the
 // "V8Debugger" tool.
-#ifndef CONTENT_BROWSER_DEBUGGER_DEBUGGER_REMOTE_SERVICE_H_
-#define CONTENT_BROWSER_DEBUGGER_DEBUGGER_REMOTE_SERVICE_H_
+#ifndef CHROME_BROWSER_DEBUGGER_DEBUGGER_REMOTE_SERVICE_H_
+#define CHROME_BROWSER_DEBUGGER_DEBUGGER_REMOTE_SERVICE_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
-#include "content/browser/debugger/devtools_remote.h"
+#include "chrome/browser/debugger/devtools_remote.h"
 
 class DevToolsProtocolHandler;
 class DevToolsRemoteMessage;
@@ -124,4 +124,4 @@ class DebuggerRemoteService : public DevToolsRemoteListener {
   DISALLOW_COPY_AND_ASSIGN(DebuggerRemoteService);
 };
 
-#endif  // CONTENT_BROWSER_DEBUGGER_DEBUGGER_REMOTE_SERVICE_H_
+#endif  // CHROME_BROWSER_DEBUGGER_DEBUGGER_REMOTE_SERVICE_H_
diff --git a/content/browser/debugger/devtools_protocol_handler.cc b/chrome/browser/debugger/devtools_protocol_handler.cc
index 2fa23c0..2245a96 100644
--- a/content/browser/debugger/devtools_protocol_handler.cc
+++ b/chrome/browser/debugger/devtools_protocol_handler.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/debugger/devtools_protocol_handler.h"
+#include "chrome/browser/debugger/devtools_protocol_handler.h"
 
 #include "base/logging.h"
-#include "content/browser/debugger/inspectable_tab_proxy.h"
-#include "content/browser/debugger/debugger_remote_service.h"
-#include "content/browser/debugger/devtools_remote_message.h"
-#include "content/browser/debugger/devtools_remote_listen_socket.h"
-#include "content/browser/debugger/devtools_remote_service.h"
-#include "content/browser/debugger/extension_ports_remote_service.h"
+#include "chrome/browser/debugger/inspectable_tab_proxy.h"
+#include "chrome/browser/debugger/debugger_remote_service.h"
+#include "chrome/browser/debugger/devtools_remote_message.h"
+#include "chrome/browser/debugger/devtools_remote_listen_socket.h"
+#include "chrome/browser/debugger/devtools_remote_service.h"
+#include "chrome/browser/debugger/extension_ports_remote_service.h"
 #include "content/browser/browser_thread.h"
 
 // static
diff --git a/content/browser/debugger/devtools_protocol_handler.h b/chrome/browser/debugger/devtools_protocol_handler.h
index 668ca94..b1b9158d 100644
--- a/content/browser/debugger/devtools_protocol_handler.h
+++ b/chrome/browser/debugger/devtools_protocol_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_DEBUGGER_DEVTOOLS_PROTOCOL_HANDLER_H_
-#define CONTENT_BROWSER_DEBUGGER_DEVTOOLS_PROTOCOL_HANDLER_H_
+#ifndef CHROME_BROWSER_DEBUGGER_DEVTOOLS_PROTOCOL_HANDLER_H_
+#define CHROME_BROWSER_DEBUGGER_DEVTOOLS_PROTOCOL_HANDLER_H_
 #pragma once
 
 #include <string>
@@ -11,7 +11,7 @@
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "content/browser/debugger/devtools_remote.h"
+#include "chrome/browser/debugger/devtools_remote.h"
 #include "net/base/listen_socket.h"
 
 class InspectableTabProxy;
@@ -73,4 +73,4 @@ class DevToolsProtocolHandler
   DISALLOW_COPY_AND_ASSIGN(DevToolsProtocolHandler);
 };
 
-#endif  // CONTENT_BROWSER_DEBUGGER_DEVTOOLS_PROTOCOL_HANDLER_H_
+#endif  // CHROME_BROWSER_DEBUGGER_DEVTOOLS_PROTOCOL_HANDLER_H_
diff --git a/content/browser/debugger/devtools_remote.h b/chrome/browser/debugger/devtools_remote.h
index cb6f41d..78b1d13 100644
--- a/content/browser/debugger/devtools_remote.h
+++ b/chrome/browser/debugger/devtools_remote.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_H_
-#define CONTENT_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_H_
+#ifndef CHROME_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_H_
+#define CHROME_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -44,4 +44,4 @@ class OutboundSocketDelegate {
   virtual void Send(const DevToolsRemoteMessage& message) = 0;
 };
 
-#endif  // CONTENT_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_H_
+#endif  // CHROME_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_H_
diff --git a/content/browser/debugger/devtools_remote_listen_socket.cc b/chrome/browser/debugger/devtools_remote_listen_socket.cc
index 5e7831f..0ec9e32 100644
--- a/content/browser/debugger/devtools_remote_listen_socket.cc
+++ b/chrome/browser/debugger/devtools_remote_listen_socket.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/debugger/devtools_remote_listen_socket.h"
+#include "chrome/browser/debugger/devtools_remote_listen_socket.h"
 
 #include "build/build_config.h"
 
@@ -21,8 +21,8 @@
 #include "base/eintr_wrapper.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/platform_thread.h"
-#include "content/browser/debugger/devtools_remote.h"
-#include "content/browser/debugger/devtools_remote_message.h"
+#include "chrome/browser/debugger/devtools_remote.h"
+#include "chrome/browser/debugger/devtools_remote_message.h"
 
 #define CONSUME_BUFFER_CHAR \
   pBuf++;\
diff --git a/content/browser/debugger/devtools_remote_listen_socket.h b/chrome/browser/debugger/devtools_remote_listen_socket.h
index 60d49c6..40212f4 100644
--- a/content/browser/debugger/devtools_remote_listen_socket.h
+++ b/chrome/browser/debugger/devtools_remote_listen_socket.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_LISTEN_SOCKET_H_
-#define CONTENT_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_LISTEN_SOCKET_H_
+#ifndef CHROME_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_LISTEN_SOCKET_H_
+#define CHROME_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_LISTEN_SOCKET_H_
 #pragma once
 
 #include <string>
 
-#include "content/browser/debugger/devtools_remote_message.h"
+#include "chrome/browser/debugger/devtools_remote_message.h"
 #include "net/base/listen_socket.h"
 
 class DevToolsRemoteListener;
@@ -69,4 +69,4 @@ class DevToolsRemoteListenSocket
   DISALLOW_COPY_AND_ASSIGN(DevToolsRemoteListenSocket);
 };
 
-#endif  // CONTENT_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_LISTEN_SOCKET_H_
+#endif  // CHROME_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_LISTEN_SOCKET_H_
diff --git a/content/browser/debugger/devtools_remote_listen_socket_unittest.cc b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc
index 348fdbb..9821b59 100644
--- a/content/browser/debugger/devtools_remote_listen_socket_unittest.cc
+++ b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.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/debugger/devtools_remote_listen_socket_unittest.h"
+#include "chrome/browser/debugger/devtools_remote_listen_socket_unittest.h"
 
 #include <fcntl.h>
 #if defined(OS_POSIX)
diff --git a/content/browser/debugger/devtools_remote_listen_socket_unittest.h b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h
index a601544d..0b9b36b 100644
--- a/content/browser/debugger/devtools_remote_listen_socket_unittest.h
+++ b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_LISTEN_SOCKET_UNITTEST_H_
-#define CONTENT_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_LISTEN_SOCKET_UNITTEST_H_
+#ifndef CHROME_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_LISTEN_SOCKET_UNITTEST_H_
+#define CHROME_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_LISTEN_SOCKET_UNITTEST_H_
 #pragma once
 
 #include "build/build_config.h"
@@ -26,9 +26,9 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
-#include "content/browser/debugger/devtools_remote.h"
-#include "content/browser/debugger/devtools_remote_listen_socket.h"
-#include "content/browser/debugger/devtools_remote_message.h"
+#include "chrome/browser/debugger/devtools_remote.h"
+#include "chrome/browser/debugger/devtools_remote_listen_socket.h"
+#include "chrome/browser/debugger/devtools_remote_message.h"
 #include "net/base/net_util.h"
 #include "net/base/listen_socket.h"
 #include "net/base/winsock_init.h"
@@ -126,4 +126,4 @@ class DevToolsRemoteListenSocketTester :
   virtual ~DevToolsRemoteListenSocketTester();
 };
 
-#endif  // CONTENT_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_LISTEN_SOCKET_UNITTEST_H_
+#endif  // CHROME_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_LISTEN_SOCKET_UNITTEST_H_
diff --git a/content/browser/debugger/devtools_remote_message.cc b/chrome/browser/debugger/devtools_remote_message.cc
index 3b6a6ab..c64a027 100644
--- a/content/browser/debugger/devtools_remote_message.cc
+++ b/chrome/browser/debugger/devtools_remote_message.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/debugger/devtools_remote_message.h"
+#include "chrome/browser/debugger/devtools_remote_message.h"
 
 #include "base/string_number_conversions.h"
 
diff --git a/content/browser/debugger/devtools_remote_message.h b/chrome/browser/debugger/devtools_remote_message.h
index 75bbad4..5e3197c 100644
--- a/content/browser/debugger/devtools_remote_message.h
+++ b/chrome/browser/debugger/devtools_remote_message.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_MESSAGE_H_
-#define CONTENT_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_MESSAGE_H_
+#ifndef CHROME_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_MESSAGE_H_
+#define CHROME_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_MESSAGE_H_
 #pragma once
 
 #include <string>
@@ -96,4 +96,4 @@ class DevToolsRemoteMessageBuilder {
   DISALLOW_COPY_AND_ASSIGN(DevToolsRemoteMessageBuilder);
 };
 
-#endif  // CONTENT_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_MESSAGE_H_
+#endif  // CHROME_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_MESSAGE_H_
diff --git a/content/browser/debugger/devtools_remote_message_unittest.cc b/chrome/browser/debugger/devtools_remote_message_unittest.cc
index 0429e1a..670cd79 100644
--- a/content/browser/debugger/devtools_remote_message_unittest.cc
+++ b/chrome/browser/debugger/devtools_remote_message_unittest.cc
@@ -6,8 +6,8 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
-#include "content/browser/debugger/devtools_remote.h"
-#include "content/browser/debugger/devtools_remote_message.h"
+#include "chrome/browser/debugger/devtools_remote.h"
+#include "chrome/browser/debugger/devtools_remote_message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class DevToolsRemoteMessageTest : public testing::Test {
diff --git a/content/browser/debugger/devtools_remote_service.cc b/chrome/browser/debugger/devtools_remote_service.cc
index 296c183..329e1a8 100644
--- a/content/browser/debugger/devtools_remote_service.cc
+++ b/chrome/browser/debugger/devtools_remote_service.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/debugger/devtools_remote_service.h"
+#include "chrome/browser/debugger/devtools_remote_service.h"
 
 #include <string>
 
@@ -10,12 +10,12 @@
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.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/sessions/restore_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/browser/debugger/devtools_manager.h"
-#include "content/browser/debugger/devtools_protocol_handler.h"
-#include "content/browser/debugger/devtools_remote_message.h"
-#include "content/browser/debugger/inspectable_tab_proxy.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/common/devtools_messages.h"
diff --git a/content/browser/debugger/devtools_remote_service.h b/chrome/browser/debugger/devtools_remote_service.h
index 165e277..c06ccf5 100644
--- a/content/browser/debugger/devtools_remote_service.h
+++ b/chrome/browser/debugger/devtools_remote_service.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_SERVICE_H_
-#define CONTENT_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_SERVICE_H_
+#ifndef CHROME_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_SERVICE_H_
+#define CHROME_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_SERVICE_H_
 #pragma once
 
 #include "base/basictypes.h"
-#include "content/browser/debugger/devtools_remote.h"
+#include "chrome/browser/debugger/devtools_remote.h"
 
 class DevToolsRemoteMessage;
 class DevToolsProtocolHandler;
@@ -47,4 +47,4 @@ class DevToolsRemoteService : public DevToolsRemoteListener {
   DISALLOW_COPY_AND_ASSIGN(DevToolsRemoteService);
 };
 
-#endif  // CONTENT_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_SERVICE_H_
+#endif  // CHROME_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_SERVICE_H_
diff --git a/content/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index fad56b0..37bd337 100644
--- a/content/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -318,7 +318,7 @@ class WorkerDevToolsSanityTest : public InProcessBrowserTest {
     if (found) {
       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
           new MessageLoop::QuitTask);
-    } else if(attempt < 30) {
+    } else if (attempt < 30) {
       MessageLoop::current()->PostDelayedTask(
           FROM_HERE,
           NewRunnableFunction(
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc
index b5161da..aa697cd 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/chrome/browser/debugger/devtools_window.cc
@@ -237,7 +237,7 @@ void DevToolsWindow::Show(DevToolsToggleAction action) {
   ScheduleAction(action);
 }
 
-void DevToolsWindow::Activate() {
+void DevToolsWindow::RequestActivate() {
   if (!docked_) {
     if (!browser_->window()->IsActive()) {
       browser_->window()->Activate();
@@ -249,7 +249,7 @@ void DevToolsWindow::Activate() {
   }
 }
 
-void DevToolsWindow::SetDocked(bool docked) {
+void DevToolsWindow::RequestSetDocked(bool docked) {
   if (docked_ == docked)
     return;
 
@@ -283,14 +283,14 @@ void DevToolsWindow::SetDocked(bool docked) {
   Show(DEVTOOLS_TOGGLE_ACTION_NONE);
 }
 
-void DevToolsWindow::Close() {
+void DevToolsWindow::RequestClose() {
     DCHECK(docked_);
     NotifyCloseListener();
     InspectedTabClosing();
 }
 
-void DevToolsWindow::SaveAs(const std::string& suggested_file_name,
-                            const std::string& content) {
+void DevToolsWindow::RequestSaveAs(const std::string& suggested_file_name,
+                                   const std::string& content) {
   DevToolsFileUtil::SaveAs(tab_contents_->profile(),
                            suggested_file_name,
                            content);
diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h
index 0692e85..3d1e706 100644
--- a/chrome/browser/debugger/devtools_window.h
+++ b/chrome/browser/debugger/devtools_window.h
@@ -54,11 +54,11 @@ class DevToolsWindow
   virtual void InspectedTabClosing();
   virtual void TabReplaced(TabContents* new_tab);
   virtual RenderViewHost* GetClientRenderViewHost();
-  virtual void Activate();
-  virtual void SetDocked(bool docked);
-  virtual void Close();
-  virtual void SaveAs(const std::string& suggested_file_name,
-                      const std::string& content);
+  virtual void RequestActivate();
+  virtual void RequestSetDocked(bool docked);
+  virtual void RequestClose();
+  virtual void RequestSaveAs(const std::string& suggested_file_name,
+                             const std::string& content);
   RenderViewHost* GetRenderViewHost();
 
   void Show(DevToolsToggleAction action);
diff --git a/content/browser/debugger/extension_ports_remote_service.cc b/chrome/browser/debugger/extension_ports_remote_service.cc
index 14e840a..3c0275d 100644
--- a/content/browser/debugger/extension_ports_remote_service.cc
+++ b/chrome/browser/debugger/extension_ports_remote_service.cc
@@ -7,7 +7,7 @@
 // Inspired significantly from debugger_remote_service
 // and ../automation/extension_port_container.
 
-#include "content/browser/debugger/extension_ports_remote_service.h"
+#include "chrome/browser/debugger/extension_ports_remote_service.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ -15,13 +15,13 @@
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.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/profiles/profile_manager.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "content/browser/debugger/devtools_manager.h"
-#include "content/browser/debugger/devtools_protocol_handler.h"
-#include "content/browser/debugger/devtools_remote_message.h"
-#include "content/browser/debugger/inspectable_tab_proxy.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/devtools_messages.h"
 
diff --git a/content/browser/debugger/extension_ports_remote_service.h b/chrome/browser/debugger/extension_ports_remote_service.h
index eb96ddeb..0a5eea6 100644
--- a/content/browser/debugger/extension_ports_remote_service.h
+++ b/chrome/browser/debugger/extension_ports_remote_service.h
@@ -15,8 +15,8 @@
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
+#include "chrome/browser/debugger/devtools_remote.h"
 #include "chrome/browser/extensions/extension_message_service.h"
-#include "content/browser/debugger/devtools_remote.h"
 #include "ipc/ipc_message.h"
 
 class DevToolsProtocolHandler;
diff --git a/content/browser/debugger/inspectable_tab_proxy.cc b/chrome/browser/debugger/inspectable_tab_proxy.cc
index 66511d8..7008179 100644
--- a/content/browser/debugger/inspectable_tab_proxy.cc
+++ b/chrome/browser/debugger/inspectable_tab_proxy.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/debugger/inspectable_tab_proxy.h"
+#include "chrome/browser/debugger/inspectable_tab_proxy.h"
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
+#include "chrome/browser/debugger/debugger_remote_service.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "content/browser/debugger/debugger_remote_service.h"
 #include "content/browser/debugger/devtools_client_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/devtools_messages.h"
diff --git a/content/browser/debugger/inspectable_tab_proxy.h b/chrome/browser/debugger/inspectable_tab_proxy.h
index 0ccaf76..0ccaf76 100644
--- a/content/browser/debugger/inspectable_tab_proxy.h
+++ b/chrome/browser/debugger/inspectable_tab_proxy.h
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 9990fef..eb760e0 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -447,10 +447,28 @@
         '..',
       ],
       'sources': [
-        '../content/browser/debugger/browser_list_tabcontents_provider.cc',
-        '../content/browser/debugger/browser_list_tabcontents_provider.h',
-        '../content/browser/debugger/debugger_remote_service.cc',
-        '../content/browser/debugger/debugger_remote_service.h',
+        'browser/debugger/browser_list_tabcontents_provider.cc',
+        'browser/debugger/browser_list_tabcontents_provider.h',
+        'browser/debugger/debugger_remote_service.cc',
+        'browser/debugger/debugger_remote_service.h',
+        'browser/debugger/devtools_file_util.cc',
+        'browser/debugger/devtools_file_util.h',
+        'browser/debugger/devtools_protocol_handler.cc',
+        'browser/debugger/devtools_protocol_handler.h',
+        'browser/debugger/devtools_remote.h',
+        'browser/debugger/devtools_remote_listen_socket.cc',
+        'browser/debugger/devtools_remote_listen_socket.h',
+        'browser/debugger/devtools_remote_message.cc',
+        'browser/debugger/devtools_remote_message.h',
+        'browser/debugger/devtools_remote_service.cc',
+        'browser/debugger/devtools_remote_service.h',
+        'browser/debugger/devtools_toggle_action.h',
+        'browser/debugger/devtools_window.cc',
+        'browser/debugger/devtools_window.h',
+        'browser/debugger/extension_ports_remote_service.cc',
+        'browser/debugger/extension_ports_remote_service.h',
+        'browser/debugger/inspectable_tab_proxy.cc',
+        'browser/debugger/inspectable_tab_proxy.h',
         '../content/browser/debugger/devtools_client_host.cc',
         '../content/browser/debugger/devtools_client_host.h',
         '../content/browser/debugger/devtools_handler.cc',
@@ -461,28 +479,10 @@
         '../content/browser/debugger/devtools_manager.h',
         '../content/browser/debugger/devtools_netlog_observer.cc',
         '../content/browser/debugger/devtools_netlog_observer.h',
-        '../content/browser/debugger/devtools_protocol_handler.cc',
-        '../content/browser/debugger/devtools_protocol_handler.h',
-        '../content/browser/debugger/devtools_remote.h',
-        '../content/browser/debugger/devtools_remote_listen_socket.cc',
-        '../content/browser/debugger/devtools_remote_listen_socket.h',
-        '../content/browser/debugger/devtools_remote_message.cc',
-        '../content/browser/debugger/devtools_remote_message.h',
-        '../content/browser/debugger/devtools_remote_service.cc',
-        '../content/browser/debugger/devtools_remote_service.h',
-        '../content/browser/debugger/extension_ports_remote_service.cc',
-        '../content/browser/debugger/extension_ports_remote_service.h',
-        '../content/browser/debugger/inspectable_tab_proxy.cc',
-        '../content/browser/debugger/inspectable_tab_proxy.h',
         '../content/browser/debugger/worker_devtools_manager_io.cc',
         '../content/browser/debugger/worker_devtools_manager_io.h',
         '../content/browser/debugger/worker_devtools_message_filter.cc',
         '../content/browser/debugger/worker_devtools_message_filter.h',
-        'browser/debugger/devtools_file_util.cc',
-        'browser/debugger/devtools_file_util.h',
-        'browser/debugger/devtools_toggle_action.h',
-        'browser/debugger/devtools_window.cc',
-        'browser/debugger/devtools_window.h',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index b50013c..1cc4a93 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -482,6 +482,7 @@
         'browser/browser_focus_uitest.cc',
         'browser/browser_keyevents_browsertest.cc',
         'browser/collected_cookies_uitest.cc',
+        'browser/debugger/devtools_sanity_unittest.cc',
         'browser/instant/instant_browsertest.cc',
         'browser/notifications/notifications_interactive_uitest.cc',
         'browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc',
@@ -501,7 +502,6 @@
         'test/interactive_ui/view_event_test_base.h',
         'test/out_of_proc_test_runner.cc',
         'test/unit/chrome_test_suite.h',
-        '../content/browser/debugger/devtools_sanity_unittest.cc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
@@ -1375,6 +1375,9 @@
         'browser/content_settings/tab_specific_content_settings_unittest.cc',
         'browser/cookies_tree_model_unittest.cc',
         'browser/custom_handlers/protocol_handler_registry_unittest.cc',
+        'browser/debugger/devtools_remote_listen_socket_unittest.cc',
+        'browser/debugger/devtools_remote_listen_socket_unittest.h',
+        'browser/debugger/devtools_remote_message_unittest.cc',
         'browser/diagnostics/diagnostics_model_unittest.cc',
         'browser/download/download_file_unittest.cc',
         'browser/download/download_manager_unittest.cc',
@@ -1972,9 +1975,6 @@
         '../content/browser/browser_url_handler_unittest.cc',
         '../content/browser/child_process_security_policy_unittest.cc',
         '../content/browser/debugger/devtools_manager_unittest.cc',
-        '../content/browser/debugger/devtools_remote_listen_socket_unittest.cc',
-        '../content/browser/debugger/devtools_remote_listen_socket_unittest.h',
-        '../content/browser/debugger/devtools_remote_message_unittest.cc',
         '../content/browser/device_orientation/provider_unittest.cc',
         '../content/browser/download/base_file_unittest.cc',
         '../content/browser/download/save_package_unittest.cc',
diff --git a/content/browser/debugger/DEPS b/content/browser/debugger/DEPS
index f7fc3b2..90d5678 100644
--- a/content/browser/debugger/DEPS
+++ b/content/browser/debugger/DEPS
@@ -8,30 +8,13 @@ include_rules = [
   # http://crbug.com/84078
   "+chrome/browser/browser_process.h",
   "+chrome/browser/debugger/devtools_window.h",
-  "+chrome/browser/download/download_prefs.h",
-  "+chrome/browser/extensions/extension_host.h",
-  "+chrome/browser/extensions/extension_message_service.h",
-  "+chrome/browser/extensions/extension_service.h",
   "+chrome/browser/io_thread.h",
   "+chrome/browser/net/chrome_net_log.h",
-  "+chrome/browser/prefs/pref_service.h",
-  "+chrome/browser/prefs/scoped_user_pref_update.h",
   "+chrome/browser/profiles/profile_manager.h",
   "+chrome/browser/sessions/restore_tab_helper.h",
-  "+chrome/browser/sessions/session_id.h",
-  "+chrome/browser/tabs/tab_strip_model.h",
-  "+chrome/browser/themes/theme_service.h",
-  "+chrome/browser/themes/theme_service_factory.h",
-  "+chrome/browser/ui/browser_list.h",
-  "+chrome/browser/ui/browser_window.h",
-  "+chrome/browser/ui/shell_dialogs.h",
   "+chrome/browser/ui/tab_contents/tab_contents_wrapper.h",
   "+chrome/browser/ui/webui/devtools_ui.h",
-  "+chrome/common/chrome_paths.h",
-  "+chrome/common/extensions/extension_messages.h",
-  "+chrome/common/pref_names.h",
   "+chrome/common/render_messages.h",
-  "+chrome/common/url_constants.h",
   "+ui/base/resource/resource_bundle.h",
 
   # DO NOT ADD ANY MORE TO THIS LIST!!!  SEE ABOVE COMMENT
diff --git a/content/browser/debugger/debugger_host.h b/content/browser/debugger/debugger_host.h
deleted file mode 100644
index 44482d5..0000000
--- a/content/browser/debugger/debugger_host.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// 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.
-
-// A part of browser-side server debugger exposed to DebuggerWrapper.
-
-#ifndef CONTENT_BROWSER_DEBUGGER_DEBUGGER_HOST_H_
-#define CONTENT_BROWSER_DEBUGGER_DEBUGGER_HOST_H_
-#pragma once
-
-#include <string>
-
-#include "base/basictypes.h"
-#include "base/memory/ref_counted.h"
-
-namespace base {
-class ListValue;
-}
-
-class DebuggerHost : public base::RefCountedThreadSafe<DebuggerHost> {
- public:
-  DebuggerHost() {}
-  virtual ~DebuggerHost() {}
-
-  // call before other methods
-  virtual void Start() = 0;
-
-  // A message from the V8 debugger in the renderer being debugged via
-  // RenderViewHost
-  virtual void DebugMessage(const std::wstring& msg) = 0;
-  // We've been successfully attached to a renderer.
-  virtual void OnDebugAttach() = 0;
-  // The renderer we're attached to is gone.
-  virtual void OnDebugDisconnect() = 0;
-
-  virtual void DidDisconnect() = 0;
-  virtual void DidConnect() {}
-  virtual void ProcessCommand(const std::wstring& data) {}
-
-  // Handles messages from debugger UI.
-  virtual void OnDebuggerHostMsg(const base::ListValue* args) {}
-
-  // Shows the debugger UI and returns true if it has any.
-  virtual bool ShowWindow() { return false; }
-
- private:
-
-  DISALLOW_COPY_AND_ASSIGN(DebuggerHost);
-};
-
-#endif  // CONTENT_BROWSER_DEBUGGER_DEBUGGER_HOST_H_
diff --git a/content/browser/debugger/devtools_client_host.h b/content/browser/debugger/devtools_client_host.h
index 37de5cc..7296ce8 100644
--- a/content/browser/debugger/devtools_client_host.h
+++ b/content/browser/debugger/devtools_client_host.h
@@ -58,21 +58,21 @@ class DevToolsClientHost {
 
   // Default front-end implementation requests that the window representing
   // this client host is activated.
-  virtual void Activate() {}
+  virtual void RequestActivate() {}
 
   // Default front-end implementation requests that the window representing
   // this client host is (un)docked.
-  virtual void SetDocked(bool docked) {}
+  virtual void RequestSetDocked(bool docked) {}
 
   // Default front-end implementation requests that the window representing
   // this client host is closed.
-  virtual void Close() {}
+  virtual void RequestClose() {}
 
   // Default front-end implementation requests that the Save As dialog using
   // default save location is shown with |suggested_file_name| as the default
   // name and |content| as the data to save.
-  virtual void SaveAs(const std::string& suggested_file_name,
-                      const std::string& content) {}
+  virtual void RequestSaveAs(const std::string& suggested_file_name,
+                             const std::string& content) {}
 
   // Returns client (front-end) RenderViewHost implementation of this
   // client host if applicable. NULL otherwise.
diff --git a/content/browser/debugger/devtools_handler.cc b/content/browser/debugger/devtools_handler.cc
index b046954..9ac789d 100644
--- a/content/browser/debugger/devtools_handler.cc
+++ b/content/browser/debugger/devtools_handler.cc
@@ -60,32 +60,32 @@ void DevToolsHandler::OnForwardToClient(const IPC::Message& message) {
 void DevToolsHandler::OnActivateWindow() {
   DevToolsClientHost* client_host = GetOwnerClientHost();
   if (client_host)
-    client_host->Activate();
+    client_host->RequestActivate();
 }
 
 void DevToolsHandler::OnCloseWindow() {
   DevToolsClientHost* client_host = GetOwnerClientHost();
   if (client_host)
-    client_host->Close();
+    client_host->RequestClose();
 }
 
 void DevToolsHandler::OnRequestDockWindow() {
   DevToolsClientHost* client_host = GetOwnerClientHost();
   if (client_host)
-    client_host->SetDocked(true);
+    client_host->RequestSetDocked(true);
 }
 
 void DevToolsHandler::OnRequestUndockWindow() {
   DevToolsClientHost* client_host = GetOwnerClientHost();
   if (client_host)
-    client_host->SetDocked(false);
+    client_host->RequestSetDocked(false);
 }
 
 void DevToolsHandler::OnSaveAs(const std::string& file_name,
                                const std::string& content) {
   DevToolsClientHost* client_host = GetOwnerClientHost();
   if (client_host)
-    client_host->SaveAs(file_name, content);
+    client_host->RequestSaveAs(file_name, content);
 }
 
 void DevToolsHandler::OnRuntimePropertyChanged(const std::string& name,