Wholesale move of debugger sources to content.

Other references are modified only to point to the new location. Follow-up changes will move build rules for the debugger into content. This adds a somewhat permissive DEPS file to content/browser/debugger. Follow-up work will whittle that down to zero dependencies on chrome/. BUG=84078 TEST=existing Review URL: http://codereview.chromium.org/7274031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90912 0039d316-1c4b-4281-b951-d872f2087c98
author: joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2011-06-29 02:16:06 +0000
committer: joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2011-06-29 02:16:06 +0000
commit: b46442d7e2e8cccf5f9bcafb2e1e3b7cf23d424b (patch)
tree: e1e0f0d2fc3653d71e93b4cca71cce5ea2cb7223
parent: 75a4e77f6c2c21706c09948269c45d98db28757b (diff)
download: chromium_src-b46442d7e2e8cccf5f9bcafb2e1e3b7cf23d424b.zip
chromium_src-b46442d7e2e8cccf5f9bcafb2e1e3b7cf23d424b.tar.gz
chromium_src-b46442d7e2e8cccf5f9bcafb2e1e3b7cf23d424b.tar.bz2
106 files changed, 199 insertions, 163 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 55e2224..eb9f6df 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -40,7 +40,6 @@
 #include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
-#include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/save_package.h"
@@ -81,6 +80,7 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
+#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/ssl/ssl_manager.h"
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 71964bd..f29dc94 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -42,7 +42,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
-#include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/download/save_package.h"
@@ -98,6 +97,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/interstitial_page.h"
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 4aefc4ee..aa0b111 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -20,10 +20,6 @@
 #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_http_protocol_handler.h"
-#include "chrome/browser/debugger/devtools_manager.h"
-#include "chrome/browser/debugger/devtools_protocol_handler.h"
 #include "chrome/browser/download/download_file_manager.h"
 #include "chrome/browser/download/mhtml_generation_manager.h"
 #include "chrome/browser/download/save_file_manager.h"
@@ -72,6 +68,10 @@
 #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/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/render_process_host.h"
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index cff371e..722deb29 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/chrome_worker_message_filter.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
-#include "chrome/browser/debugger/devtools_handler.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_message_handler.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ -46,6 +45,7 @@
 #include "chrome/common/url_constants.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/child_process_security_policy.h"
+#include "content/browser/debugger/devtools_handler.h"
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/renderer_host/browser_render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
diff --git a/chrome/browser/extensions/extension_debugger_api.cc b/chrome/browser/extensions/extension_debugger_api.cc
index 8a47316..2183c1f7 100644
--- a/chrome/browser/extensions/extension_debugger_api.cc
+++ b/chrome/browser/extensions/extension_debugger_api.cc
@@ -14,8 +14,6 @@
 #include "base/memory/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/debugger/devtools_client_host.h"
-#include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/extensions/extension_debugger_api_constants.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
@@ -23,6 +21,8 @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_error_utils.h"
+#include "content/browser/debugger/devtools_client_host.h"
+#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/devtools_messages.h"
 #include "content/common/notification_service.h"
diff --git a/chrome/browser/extensions/extension_devtools_bridge.cc b/chrome/browser/extensions/extension_devtools_bridge.cc
index b928025..53da8ce 100644
--- a/chrome/browser/extensions/extension_devtools_bridge.cc
+++ b/chrome/browser/extensions/extension_devtools_bridge.cc
@@ -9,13 +9,13 @@
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
-#include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/extensions/extension_devtools_events.h"
 #include "chrome/browser/extensions/extension_devtools_manager.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/devtools_messages.h"
 
diff --git a/chrome/browser/extensions/extension_devtools_bridge.h b/chrome/browser/extensions/extension_devtools_bridge.h
index b80b162..983a9d2 100644
--- a/chrome/browser/extensions/extension_devtools_bridge.h
+++ b/chrome/browser/extensions/extension_devtools_bridge.h
@@ -9,9 +9,9 @@
 #include <string>
 
 #include "base/memory/ref_counted.h"
-#include "chrome/browser/debugger/devtools_client_host.h"
 #include "chrome/browser/extensions/extension_devtools_manager.h"
 #include "chrome/browser/extensions/extension_message_service.h"
+#include "content/browser/debugger/devtools_client_host.h"
 
 class Profile;
 
@@ -55,4 +55,3 @@ class ExtensionDevToolsBridge : public DevToolsClientHost {
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_DEVTOOLS_BRIDGE_H_
-
diff --git a/chrome/browser/extensions/extension_devtools_browsertests.cc b/chrome/browser/extensions/extension_devtools_browsertests.cc
index 7ead773..76ed6cd 100644
--- a/chrome/browser/extensions/extension_devtools_browsertests.cc
+++ b/chrome/browser/extensions/extension_devtools_browsertests.cc
@@ -4,8 +4,6 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/stringprintf.h"
-#include "chrome/browser/debugger/devtools_client_host.h"
-#include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/extensions/extension_devtools_browsertest.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_host.h"
@@ -18,6 +16,8 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/ui_test_utils.h"
+#include "content/browser/debugger/devtools_client_host.h"
+#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index d3f9512..20cfe99 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -24,7 +24,6 @@
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/extensions/apps_promo.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
@@ -71,6 +70,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
+#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/render_process_host.h"
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index e558542..371f977 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -15,8 +15,6 @@
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
-#include "chrome/browser/debugger/devtools_manager.h"
-#include "chrome/browser/debugger/devtools_toggle_action.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
@@ -37,6 +35,8 @@
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/debugger/devtools_manager.h"
+#include "content/browser/debugger/devtools_toggle_action.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host.h"
diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc
index c738c55..79b4bca 100644
--- a/chrome/browser/external_tab_container_win.cc
+++ b/chrome/browser/external_tab_container_win.cc
@@ -14,8 +14,6 @@
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/automation/automation_provider.h"
-#include "chrome/browser/debugger/devtools_manager.h"
-#include "chrome/browser/debugger/devtools_toggle_action.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/history_tab_helper.h"
@@ -36,6 +34,8 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/debugger/devtools_manager.h"
+#include "content/browser/debugger/devtools_toggle_action.h"
 #include "content/browser/load_notification_details.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 4bc2f817..dd728b7 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -12,7 +12,6 @@
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
-#include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/extensions/apps_promo.h"
 #include "chrome/browser/extensions/extension_prefs.h"
@@ -57,6 +56,7 @@
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/browser/web_resource/promo_resource_service.h"
 #include "chrome/common/pref_names.h"
+#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/host_zoom_map.h"
 #include "content/browser/renderer_host/browser_render_process_host.h"
 #include "content/browser/ssl/ssl_manager.h"
diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc
index 56a4a4f..d82a155 100644
--- a/chrome/browser/printing/print_dialog_cloud.cc
+++ b/chrome/browser/printing/print_dialog_cloud.cc
@@ -11,7 +11,6 @@
 #include "base/json/json_reader.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
 #include "chrome/browser/profiles/profile.h"
@@ -23,6 +22,7 @@
 #include "chrome/common/print_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.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/browser/tab_contents/tab_contents_view.h"
diff --git a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
index 31295f6..6322819 100644
--- a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
+++ b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
@@ -5,11 +5,11 @@
 #include "content/browser/renderer_host/render_process_host_browsertest.h"
 
 #include "base/command_line.h"
-#include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/ui_test_utils.h"
+#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index 3d0d6d9..4a6f871 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -19,8 +19,6 @@
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/debugger/devtools_manager.h"
-#include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/download/save_package.h"
@@ -51,6 +49,8 @@
 #include "chrome/common/spellcheck_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/child_process_security_policy.h"
+#include "content/browser/debugger/devtools_manager.h"
+#include "content/browser/debugger/devtools_window.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/navigation_entry.h"
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 3fa7eea..80c4a5c9 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -31,9 +31,6 @@
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/browser_url_handler.h"
 #include "chrome/browser/character_encoding.h"
-#include "chrome/browser/debugger/devtools_manager.h"
-#include "chrome/browser/debugger/devtools_toggle_action.h"
-#include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
@@ -111,6 +108,9 @@
 #include "chrome/common/profiling.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/web_apps.h"
+#include "content/browser/debugger/devtools_manager.h"
+#include "content/browser/debugger/devtools_toggle_action.h"
+#include "content/browser/debugger/devtools_window.h"
 #include "content/browser/host_zoom_map.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/site_instance.h"
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index f9bf251..850e5ca 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -18,7 +18,6 @@
 #include "base/string16.h"
 #include "base/task.h"
 #include "chrome/browser/command_updater.h"
-#include "chrome/browser/debugger/devtools_toggle_action.h"
 #include "chrome/browser/instant/instant_delegate.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
@@ -39,6 +38,7 @@
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/extensions/extension_constants.h"
+#include "content/browser/debugger/devtools_toggle_action.h"
 #include "content/browser/tab_contents/page_navigator.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/common/notification_registrar.h"
diff --git a/chrome/browser/ui/cocoa/dev_tools_controller.mm b/chrome/browser/ui/cocoa/dev_tools_controller.mm
index 838d9fe..59fe8ba 100644
--- a/chrome/browser/ui/cocoa/dev_tools_controller.mm
+++ b/chrome/browser/ui/cocoa/dev_tools_controller.mm
@@ -9,12 +9,12 @@
 #include <Cocoa/Cocoa.h>
 
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "chrome/common/pref_names.h"
+#include "content/browser/debugger/devtools_window.h"
 #include "content/browser/tab_contents/tab_contents.h"
 
 namespace {
diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
index e48b2c8..39e03b7 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
@@ -6,7 +6,6 @@
 
 #include <algorithm>
 
-#include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/profiles/profile.h"
@@ -14,6 +13,7 @@
 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
+#include "content/browser/debugger/devtools_manager.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_source.h"
diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm
index b62a9e7..64179f3 100644
--- a/chrome/browser/ui/cocoa/tabpose_window.mm
+++ b/chrome/browser/ui/cocoa/tabpose_window.mm
@@ -14,7 +14,6 @@
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
-#import "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ -29,6 +28,7 @@
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/pref_names.h"
+#import "content/browser/debugger/devtools_window.h"
 #include "content/browser/renderer_host/backing_store_mac.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index ff83b98..eebd88d 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -16,7 +16,6 @@
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
-#include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/net/url_fixer_upper.h"
@@ -49,6 +48,7 @@
 #include "chrome/browser/ui/tabs/tab_menu_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "content/browser/debugger/devtools_window.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 52b92ff..d1d43a0 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -25,7 +25,6 @@
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/page_info_window.h"
@@ -78,6 +77,7 @@
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "content/browser/debugger/devtools_window.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc
index 995e619..6ebb365 100644
--- a/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc
+++ b/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc
@@ -10,7 +10,6 @@
 
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
-#include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/profiles/profile.h"
@@ -18,6 +17,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
+#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc
index 4007371..416f51e 100644
--- a/chrome/browser/ui/views/extensions/extension_popup.cc
+++ b/chrome/browser/ui/views/extensions/extension_popup.cc
@@ -6,8 +6,6 @@
 
 #include <vector>
 
-#include "chrome/browser/debugger/devtools_manager.h"
-#include "chrome/browser/debugger/devtools_toggle_action.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/profiles/profile.h"
@@ -15,6 +13,8 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/extensions/extension.h"
+#include "content/browser/debugger/devtools_manager.h"
+#include "content/browser/debugger/devtools_toggle_action.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/common/notification_details.h"
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 66c3f1d..055f444 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -21,7 +21,6 @@
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/extensions/extension_tts_api.h"
@@ -74,6 +73,7 @@
 #include "chrome/common/native_window_notification_source.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/debugger/devtools_window.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.cc b/chrome/browser/ui/webui/options/extension_settings_handler.cc
index a57e163..1ad15a6 100644
--- a/chrome/browser/ui/webui/options/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/extension_settings_handler.cc
@@ -15,8 +15,6 @@
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
-#include "chrome/browser/debugger/devtools_manager.h"
-#include "chrome/browser/debugger/devtools_toggle_action.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
@@ -36,6 +34,8 @@
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/debugger/devtools_manager.h"
+#include "content/browser/debugger/devtools_toggle_action.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host.h"
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 60d94f6..8c90387 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -367,7 +367,7 @@
           # the real inputs/outputs at GYP time isn't possible.
           'variables': {
             'grit_cmd': ['python', '../tools/grit/grit.py'],
-            'frontend_folder': 'browser/debugger/frontend',
+            'frontend_folder': '../content/browser/debugger/frontend',
             'grit_grd_file':
                '<(frontend_folder)/devtools_frontend_resources.grd',
           },
@@ -418,6 +418,7 @@
       ],
     },
     {
+      # TODO(joi): Move debugger-related build rules to content/
       'target_name': 'debugger',
       'type': 'static_library',
       'dependencies': [
@@ -437,38 +438,38 @@
         '..',
       ],
       'sources': [
-        '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_client_host.cc',
-        'browser/debugger/devtools_client_host.h',
-        'browser/debugger/devtools_file_util.cc',
-        'browser/debugger/devtools_file_util.h',
-        'browser/debugger/devtools_http_protocol_handler.cc',
-        'browser/debugger/devtools_http_protocol_handler.h',
-        'browser/debugger/devtools_manager.cc',
-        'browser/debugger/devtools_manager.h',
-        'browser/debugger/devtools_netlog_observer.cc',
-        'browser/debugger/devtools_netlog_observer.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_handler.cc',
-        'browser/debugger/devtools_handler.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/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',
+        '../content/browser/debugger/devtools_client_host.cc',
+        '../content/browser/debugger/devtools_client_host.h',
+        '../content/browser/debugger/devtools_file_util.cc',
+        '../content/browser/debugger/devtools_file_util.h',
+        '../content/browser/debugger/devtools_http_protocol_handler.cc',
+        '../content/browser/debugger/devtools_http_protocol_handler.h',
+        '../content/browser/debugger/devtools_manager.cc',
+        '../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/devtools_handler.cc',
+        '../content/browser/debugger/devtools_handler.h',
+        '../content/browser/debugger/devtools_toggle_action.h',
+        '../content/browser/debugger/devtools_window.cc',
+        '../content/browser/debugger/devtools_window.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',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 7a3914c..2bd67de 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -476,7 +476,6 @@
         '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',
@@ -495,6 +494,7 @@
         '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', {
@@ -534,7 +534,6 @@
         ['OS=="mac"', {
           'sources!': [
             # TODO(port)
-            'browser/debugger/devtools_sanity_unittest.cc',
             'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
             'browser/ui/views/button_dropdown_test.cc',
             'browser/ui/views/find_bar_host_interactive_uitest.cc',
@@ -544,6 +543,7 @@
             'test/interactive_ui/npapi_interactive_test.cc',
             'test/interactive_ui/view_event_test_base.cc',
             'test/interactive_ui/view_event_test_base.h',
+            '../content/browser/debugger/devtools_sanity_unittest.cc',
           ],
           # See comment about the same line in chrome/chrome_tests.gypi.
           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
@@ -1363,10 +1363,6 @@
         '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_manager_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/base_file_unittest.cc',
         'browser/download/download_file_unittest.cc',
@@ -1960,6 +1956,10 @@
         '../content/browser/appcache/chrome_appcache_service_unittest.cc',
         '../content/browser/browser_thread_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/geolocation/device_data_provider_unittest.cc',
         '../content/browser/geolocation/fake_access_token_store.cc',
diff --git a/content/browser/DEPS b/content/browser/DEPS
index 84614ce..903367b 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -9,10 +9,6 @@ include_rules = [
 
   "+chrome/browser/browser_url_handler.h",
 
-  # http://crbug.com/84078
-  "+chrome/browser/debugger/devtools_manager.h",
-  "+chrome/browser/debugger/devtools_netlog_observer.h",
-
   # http://crbug.com/82782
   "+chrome/browser/download/download_file_manager.h",
   "+chrome/browser/download/download_manager.h",
@@ -31,6 +27,6 @@ include_rules = [
 
   # ONLY USED BY TESTS
   "+chrome/browser/ui/browser.h",
-  
+
   # DO NOT ADD ANY MORE TO THIS LIST!!!  SEE ABOVE COMMENT
 ]
diff --git a/content/browser/debugger/DEPS b/content/browser/debugger/DEPS
new file mode 100644
index 0000000..973edd6
--- /dev/null
+++ b/content/browser/debugger/DEPS
@@ -0,0 +1,37 @@
+include_rules = [
+  # Listing of the remaining #chrome includes in content/browser/debugger.
+  # We are actively working on reducing this to 0.
+  # DO NOT ADD ANY MORE TO THIS LIST!!!
+  # See https://sites.google.com/a/chromium.org/dev/developers/content-module
+  # for more information.
+
+  # http://crbug.com/84078
+  "+chrome/browser/browser_process.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/OWNERS b/content/browser/debugger/OWNERS
new file mode 100644
index 0000000..1b8b683
--- /dev/null
+++ b/content/browser/debugger/OWNERS
@@ -0,0 +1,3 @@
+joi@chromium.org
+pfeldman@chromium.org
+yurys@chromium.org
diff --git a/chrome/browser/debugger/browser_list_tabcontents_provider.cc b/content/browser/debugger/browser_list_tabcontents_provider.cc
index 65addd8..3214ded 100644
--- a/chrome/browser/debugger/browser_list_tabcontents_provider.cc
+++ b/content/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 "chrome/browser/debugger/browser_list_tabcontents_provider.h"
+#include "content/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/chrome/browser/debugger/browser_list_tabcontents_provider.h b/content/browser/debugger/browser_list_tabcontents_provider.h
index f7fd61e..ed78943 100644
--- a/chrome/browser/debugger/browser_list_tabcontents_provider.h
+++ b/content/browser/debugger/browser_list_tabcontents_provider.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_DEBUGGER_BROWSER_LIST_TABCONTENTS_PROVIDER_H_
 #define CHROME_BROWSER_DEBUGGER_BROWSER_LIST_TABCONTENTS_PROVIDER_H_
 
-#include "chrome/browser/debugger/devtools_http_protocol_handler.h"
+#include "content/browser/debugger/devtools_http_protocol_handler.h"
 
 class BrowserListTabContentsProvider :
     public DevToolsHttpProtocolHandler::TabContentsProvider {
diff --git a/chrome/browser/debugger/debugger_host.h b/content/browser/debugger/debugger_host.h
index 6177c16..6177c16 100644
--- a/chrome/browser/debugger/debugger_host.h
+++ b/content/browser/debugger/debugger_host.h
diff --git a/chrome/browser/debugger/debugger_remote_service.cc b/content/browser/debugger/debugger_remote_service.cc
index 47ccdae..cd5eae5 100644
--- a/chrome/browser/debugger/debugger_remote_service.cc
+++ b/content/browser/debugger/debugger_remote_service.cc
@@ -5,7 +5,7 @@
 // This file contains implementations of the DebuggerRemoteService methods,
 // defines DebuggerRemoteService and DebuggerRemoteServiceCommand constants.
 
-#include "chrome/browser/debugger/debugger_remote_service.h"
+#include "content/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_manager.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/chrome/browser/debugger/debugger_remote_service.h b/content/browser/debugger/debugger_remote_service.h
index 83b1f40..1e03963 100644
--- a/chrome/browser/debugger/debugger_remote_service.h
+++ b/content/browser/debugger/debugger_remote_service.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -12,7 +12,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/browser/debugger/devtools_remote.h"
+#include "content/browser/debugger/devtools_remote.h"
 
 class DevToolsProtocolHandler;
 class DevToolsRemoteMessage;
diff --git a/chrome/browser/debugger/devtools_client_host.cc b/content/browser/debugger/devtools_client_host.cc
index f619bfb..5c9d57c 100644
--- a/chrome/browser/debugger/devtools_client_host.cc
+++ b/content/browser/debugger/devtools_client_host.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "chrome/browser/debugger/devtools_client_host.h"
+#include "content/browser/debugger/devtools_client_host.h"
 
 DevToolsWindow* DevToolsClientHost::AsDevToolsWindow() {
   return NULL;
diff --git a/chrome/browser/debugger/devtools_client_host.h b/content/browser/debugger/devtools_client_host.h
index 4c81e87..fe919fd 100644
--- a/chrome/browser/debugger/devtools_client_host.h
+++ b/content/browser/debugger/devtools_client_host.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/browser/debugger/devtools_file_util.cc b/content/browser/debugger/devtools_file_util.cc
index 1e4217d..d28ee82 100644
--- a/chrome/browser/debugger/devtools_file_util.cc
+++ b/content/browser/debugger/devtools_file_util.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 "chrome/browser/debugger/devtools_file_util.h"
+#include "content/browser/debugger/devtools_file_util.h"
 
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/debugger/devtools_file_util.h b/content/browser/debugger/devtools_file_util.h
index a70c8af..a70c8af 100644
--- a/chrome/browser/debugger/devtools_file_util.h
+++ b/content/browser/debugger/devtools_file_util.h
diff --git a/chrome/browser/debugger/devtools_handler.cc b/content/browser/debugger/devtools_handler.cc
index 3627954..59eef70 100644
--- a/chrome/browser/debugger/devtools_handler.cc
+++ b/content/browser/debugger/devtools_handler.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/debugger/devtools_handler.h"
+#include "content/browser/debugger/devtools_handler.h"
 
-#include "chrome/browser/debugger/devtools_file_util.h"
-#include "chrome/browser/debugger/devtools_manager.h"
+#include "content/browser/debugger/devtools_file_util.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"
diff --git a/chrome/browser/debugger/devtools_handler.h b/content/browser/debugger/devtools_handler.h
index fbc93ec..fbc93ec 100644
--- a/chrome/browser/debugger/devtools_handler.h
+++ b/content/browser/debugger/devtools_handler.h
diff --git a/chrome/browser/debugger/devtools_http_protocol_handler.cc b/content/browser/debugger/devtools_http_protocol_handler.cc
index 1c67f8d..20a339a 100644
--- a/chrome/browser/debugger/devtools_http_protocol_handler.cc
+++ b/content/browser/debugger/devtools_http_protocol_handler.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 "chrome/browser/debugger/devtools_http_protocol_handler.h"
+#include "content/browser/debugger/devtools_http_protocol_handler.h"
 
 #include <utility>
 
@@ -15,13 +15,13 @@
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/debugger/devtools_client_host.h"
-#include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/devtools_ui.h"
 #include "content/browser/browser_thread.h"
+#include "content/browser/debugger/devtools_client_host.h"
+#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/devtools_messages.h"
 #include "grit/devtools_frontend_resources.h"
diff --git a/chrome/browser/debugger/devtools_http_protocol_handler.h b/content/browser/debugger/devtools_http_protocol_handler.h
index dcbdb3b..dcbdb3b 100644
--- a/chrome/browser/debugger/devtools_http_protocol_handler.h
+++ b/content/browser/debugger/devtools_http_protocol_handler.h
diff --git a/chrome/browser/debugger/devtools_manager.cc b/content/browser/debugger/devtools_manager.cc
index 0f4180b..2db4480 100644
--- a/chrome/browser/debugger/devtools_manager.cc
+++ b/content/browser/debugger/devtools_manager.cc
@@ -2,16 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/debugger/devtools_manager.h"
+#include "content/browser/debugger/devtools_manager.h"
 
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/message_loop.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/debugger/devtools_client_host.h"
-#include "chrome/browser/debugger/devtools_netlog_observer.h"
-#include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ -19,6 +16,9 @@
 #include "chrome/common/pref_names.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/child_process_security_policy.h"
+#include "content/browser/debugger/devtools_client_host.h"
+#include "content/browser/debugger/devtools_netlog_observer.h"
+#include "content/browser/debugger/devtools_window.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/site_instance.h"
 #include "content/common/devtools_messages.h"
diff --git a/chrome/browser/debugger/devtools_manager.h b/content/browser/debugger/devtools_manager.h
index ae44f76..93f18ad 100644
--- a/chrome/browser/debugger/devtools_manager.h
+++ b/content/browser/debugger/devtools_manager.h
@@ -10,8 +10,8 @@
 #include <string>
 
 #include "base/memory/ref_counted.h"
-#include "chrome/browser/debugger/devtools_client_host.h"
-#include "chrome/browser/debugger/devtools_toggle_action.h"
+#include "content/browser/debugger/devtools_client_host.h"
+#include "content/browser/debugger/devtools_toggle_action.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "webkit/glue/resource_loader_bridge.h"
diff --git a/chrome/browser/debugger/devtools_manager_unittest.cc b/content/browser/debugger/devtools_manager_unittest.cc
index b2a7d2a..6eb70a2 100644
--- a/chrome/browser/debugger/devtools_manager_unittest.cc
+++ b/content/browser/debugger/devtools_manager_unittest.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
 #include "base/basictypes.h"
-#include "chrome/browser/debugger/devtools_client_host.h"
-#include "chrome/browser/debugger/devtools_manager.h"
-#include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/common/render_messages.h"
+#include "content/browser/debugger/devtools_client_host.h"
+#include "content/browser/debugger/devtools_manager.h"
+#include "content/browser/debugger/devtools_window.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/debugger/devtools_netlog_observer.cc b/content/browser/debugger/devtools_netlog_observer.cc
index e70b044..919c53c 100644
--- a/chrome/browser/debugger/devtools_netlog_observer.cc
+++ b/content/browser/debugger/devtools_netlog_observer.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 "chrome/browser/debugger/devtools_netlog_observer.h"
+#include "content/browser/debugger/devtools_netlog_observer.h"
 
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
diff --git a/chrome/browser/debugger/devtools_netlog_observer.h b/content/browser/debugger/devtools_netlog_observer.h
index 75efa8e..75efa8e 100644
--- a/chrome/browser/debugger/devtools_netlog_observer.h
+++ b/content/browser/debugger/devtools_netlog_observer.h
diff --git a/chrome/browser/debugger/devtools_protocol_handler.cc b/content/browser/debugger/devtools_protocol_handler.cc
index 2245a96..2fa23c0 100644
--- a/chrome/browser/debugger/devtools_protocol_handler.cc
+++ b/content/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 "chrome/browser/debugger/devtools_protocol_handler.h"
+#include "content/browser/debugger/devtools_protocol_handler.h"
 
 #include "base/logging.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/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 "content/browser/browser_thread.h"
 
 // static
diff --git a/chrome/browser/debugger/devtools_protocol_handler.h b/content/browser/debugger/devtools_protocol_handler.h
index b1b9158d..14a7187 100644
--- a/chrome/browser/debugger/devtools_protocol_handler.h
+++ b/content/browser/debugger/devtools_protocol_handler.h
@@ -11,7 +11,7 @@
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/debugger/devtools_remote.h"
+#include "content/browser/debugger/devtools_remote.h"
 #include "net/base/listen_socket.h"
 
 class InspectableTabProxy;
diff --git a/chrome/browser/debugger/devtools_remote.h b/content/browser/debugger/devtools_remote.h
index 78b1d13..78b1d13 100644
--- a/chrome/browser/debugger/devtools_remote.h
+++ b/content/browser/debugger/devtools_remote.h
diff --git a/chrome/browser/debugger/devtools_remote_listen_socket.cc b/content/browser/debugger/devtools_remote_listen_socket.cc
index 0ec9e32..5e7831f 100644
--- a/chrome/browser/debugger/devtools_remote_listen_socket.cc
+++ b/content/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 "chrome/browser/debugger/devtools_remote_listen_socket.h"
+#include "content/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 "chrome/browser/debugger/devtools_remote.h"
-#include "chrome/browser/debugger/devtools_remote_message.h"
+#include "content/browser/debugger/devtools_remote.h"
+#include "content/browser/debugger/devtools_remote_message.h"
 
 #define CONSUME_BUFFER_CHAR \
   pBuf++;\
diff --git a/chrome/browser/debugger/devtools_remote_listen_socket.h b/content/browser/debugger/devtools_remote_listen_socket.h
index 40212f4..3b09914 100644
--- a/chrome/browser/debugger/devtools_remote_listen_socket.h
+++ b/content/browser/debugger/devtools_remote_listen_socket.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "chrome/browser/debugger/devtools_remote_message.h"
+#include "content/browser/debugger/devtools_remote_message.h"
 #include "net/base/listen_socket.h"
 
 class DevToolsRemoteListener;
diff --git a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc b/content/browser/debugger/devtools_remote_listen_socket_unittest.cc
index 9821b59..348fdbb 100644
--- a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc
+++ b/content/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 "chrome/browser/debugger/devtools_remote_listen_socket_unittest.h"
+#include "content/browser/debugger/devtools_remote_listen_socket_unittest.h"
 
 #include <fcntl.h>
 #if defined(OS_POSIX)
diff --git a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h b/content/browser/debugger/devtools_remote_listen_socket_unittest.h
index 0b9b36b..42aef56 100644
--- a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h
+++ b/content/browser/debugger/devtools_remote_listen_socket_unittest.h
@@ -26,9 +26,9 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/threading/thread.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 "content/browser/debugger/devtools_remote.h"
+#include "content/browser/debugger/devtools_remote_listen_socket.h"
+#include "content/browser/debugger/devtools_remote_message.h"
 #include "net/base/net_util.h"
 #include "net/base/listen_socket.h"
 #include "net/base/winsock_init.h"
diff --git a/chrome/browser/debugger/devtools_remote_message.cc b/content/browser/debugger/devtools_remote_message.cc
index 6d82a28..3b6a6ab 100644
--- a/chrome/browser/debugger/devtools_remote_message.cc
+++ b/content/browser/debugger/devtools_remote_message.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "chrome/browser/debugger/devtools_remote_message.h"
+#include "content/browser/debugger/devtools_remote_message.h"
 
 #include "base/string_number_conversions.h"
 
diff --git a/chrome/browser/debugger/devtools_remote_message.h b/content/browser/debugger/devtools_remote_message.h
index e836164..5e3197c 100644
--- a/chrome/browser/debugger/devtools_remote_message.h
+++ b/content/browser/debugger/devtools_remote_message.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/browser/debugger/devtools_remote_message_unittest.cc b/content/browser/debugger/devtools_remote_message_unittest.cc
index 670cd79..0429e1a 100644
--- a/chrome/browser/debugger/devtools_remote_message_unittest.cc
+++ b/content/browser/debugger/devtools_remote_message_unittest.cc
@@ -6,8 +6,8 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
-#include "chrome/browser/debugger/devtools_remote.h"
-#include "chrome/browser/debugger/devtools_remote_message.h"
+#include "content/browser/debugger/devtools_remote.h"
+#include "content/browser/debugger/devtools_remote_message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class DevToolsRemoteMessageTest : public testing::Test {
diff --git a/chrome/browser/debugger/devtools_remote_service.cc b/content/browser/debugger/devtools_remote_service.cc
index a8f57a3..296c183 100644
--- a/chrome/browser/debugger/devtools_remote_service.cc
+++ b/content/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 "chrome/browser/debugger/devtools_remote_service.h"
+#include "content/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_manager.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/chrome/browser/debugger/devtools_remote_service.h b/content/browser/debugger/devtools_remote_service.h
index bd813bd..d2e37c8 100644
--- a/chrome/browser/debugger/devtools_remote_service.h
+++ b/content/browser/debugger/devtools_remote_service.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "chrome/browser/debugger/devtools_remote.h"
+#include "content/browser/debugger/devtools_remote.h"
 
 class DevToolsRemoteMessage;
 class DevToolsProtocolHandler;
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/content/browser/debugger/devtools_sanity_unittest.cc
index e07f06c..365efac 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/content/browser/debugger/devtools_sanity_unittest.cc
@@ -6,9 +6,6 @@
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/debugger/devtools_client_host.h"
-#include "chrome/browser/debugger/devtools_manager.h"
-#include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ -16,6 +13,9 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
+#include "content/browser/debugger/devtools_client_host.h"
+#include "content/browser/debugger/devtools_manager.h"
+#include "content/browser/debugger/devtools_window.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_registrar.h"
diff --git a/chrome/browser/debugger/devtools_toggle_action.h b/content/browser/debugger/devtools_toggle_action.h
index 33b0321..f3435e0 100644
--- a/chrome/browser/debugger/devtools_toggle_action.h
+++ b/content/browser/debugger/devtools_toggle_action.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/browser/debugger/devtools_window.cc b/content/browser/debugger/devtools_window.cc
index dd24777..1b3ad5e 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/content/browser/debugger/devtools_window.cc
@@ -9,8 +9,6 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/debugger/devtools_manager.h"
-#include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
@@ -26,6 +24,8 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/debugger/devtools_manager.h"
+#include "content/browser/debugger/devtools_window.h"
 #include "content/browser/in_process_webkit/session_storage_namespace.h"
 #include "content/browser/load_notification_details.h"
 #include "content/browser/renderer_host/render_view_host.h"
diff --git a/chrome/browser/debugger/devtools_window.h b/content/browser/debugger/devtools_window.h
index 23c724b..4d6b50b 100644
--- a/chrome/browser/debugger/devtools_window.h
+++ b/content/browser/debugger/devtools_window.h
@@ -9,8 +9,8 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/browser/debugger/devtools_client_host.h"
-#include "chrome/browser/debugger/devtools_toggle_action.h"
+#include "content/browser/debugger/devtools_client_host.h"
+#include "content/browser/debugger/devtools_toggle_action.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
diff --git a/chrome/browser/debugger/extension_ports_remote_service.cc b/content/browser/debugger/extension_ports_remote_service.cc
index bf960e3..14e840a 100644
--- a/chrome/browser/debugger/extension_ports_remote_service.cc
+++ b/content/browser/debugger/extension_ports_remote_service.cc
@@ -7,7 +7,7 @@
 // Inspired significantly from debugger_remote_service
 // and ../automation/extension_port_container.
 
-#include "chrome/browser/debugger/extension_ports_remote_service.h"
+#include "content/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_manager.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/chrome/browser/debugger/extension_ports_remote_service.h b/content/browser/debugger/extension_ports_remote_service.h
index 4904e98..3efaa49 100644
--- a/chrome/browser/debugger/extension_ports_remote_service.h
+++ b/content/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/chrome/browser/debugger/frontend/devtools_frontend.html b/content/browser/debugger/frontend/devtools_frontend.html
index 85c03b8..85c03b8 100644
--- a/chrome/browser/debugger/frontend/devtools_frontend.html
+++ b/content/browser/debugger/frontend/devtools_frontend.html
diff --git a/chrome/browser/debugger/frontend/devtools_frontend_resources.grd b/content/browser/debugger/frontend/devtools_frontend_resources.grd
index 0351cac..0351cac 100644
--- a/chrome/browser/debugger/frontend/devtools_frontend_resources.grd
+++ b/content/browser/debugger/frontend/devtools_frontend_resources.grd
diff --git a/chrome/browser/debugger/inspectable_tab_proxy.cc b/content/browser/debugger/inspectable_tab_proxy.cc
index ccbb0ec..6c4a030 100644
--- a/chrome/browser/debugger/inspectable_tab_proxy.cc
+++ b/content/browser/debugger/inspectable_tab_proxy.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/debugger/inspectable_tab_proxy.h"
+#include "content/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/debugger/devtools_client_host.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/chrome/browser/debugger/inspectable_tab_proxy.h b/content/browser/debugger/inspectable_tab_proxy.h
index 1b6e336..b82382e 100644
--- a/chrome/browser/debugger/inspectable_tab_proxy.h
+++ b/content/browser/debugger/inspectable_tab_proxy.h
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
-#include "chrome/browser/debugger/devtools_client_host.h"
+#include "content/browser/debugger/devtools_client_host.h"
 
 class DebuggerRemoteService;
 class DevToolsClientHost;
diff --git a/chrome/browser/debugger/manual_tests/console-call-line-numbers.html b/content/browser/debugger/manual_tests/console-call-line-numbers.html
index 98bb918..98bb918 100644
--- a/chrome/browser/debugger/manual_tests/console-call-line-numbers.html
+++ b/content/browser/debugger/manual_tests/console-call-line-numbers.html
diff --git a/chrome/browser/debugger/manual_tests/debugger-exception-on-load.html b/content/browser/debugger/manual_tests/debugger-exception-on-load.html
index ef2384f..ef2384f 100644
--- a/chrome/browser/debugger/manual_tests/debugger-exception-on-load.html
+++ b/content/browser/debugger/manual_tests/debugger-exception-on-load.html
diff --git a/chrome/browser/debugger/manual_tests/debugger-execution-while-paused.html b/content/browser/debugger/manual_tests/debugger-execution-while-paused.html
index f33abea..f33abea 100644
--- a/chrome/browser/debugger/manual_tests/debugger-execution-while-paused.html
+++ b/content/browser/debugger/manual_tests/debugger-execution-while-paused.html
diff --git a/chrome/browser/debugger/manual_tests/debugger-fake-workers.html b/content/browser/debugger/manual_tests/debugger-fake-workers.html
index 6a7cb03..6a7cb03 100644
--- a/chrome/browser/debugger/manual_tests/debugger-fake-workers.html
+++ b/content/browser/debugger/manual_tests/debugger-fake-workers.html
diff --git a/chrome/browser/debugger/manual_tests/debugger-pause-on-else-statements.html b/content/browser/debugger/manual_tests/debugger-pause-on-else-statements.html
index 3c80a43..3c80a43 100644
--- a/chrome/browser/debugger/manual_tests/debugger-pause-on-else-statements.html
+++ b/content/browser/debugger/manual_tests/debugger-pause-on-else-statements.html
diff --git a/chrome/browser/debugger/manual_tests/debugger-pause-on-for-in-statements.html b/content/browser/debugger/manual_tests/debugger-pause-on-for-in-statements.html
index 79f7983..79f7983 100644
--- a/chrome/browser/debugger/manual_tests/debugger-pause-on-for-in-statements.html
+++ b/content/browser/debugger/manual_tests/debugger-pause-on-for-in-statements.html
diff --git a/chrome/browser/debugger/manual_tests/debugger-pause-on-for-statements.html b/content/browser/debugger/manual_tests/debugger-pause-on-for-statements.html
index 1a9e274..1a9e274 100644
--- a/chrome/browser/debugger/manual_tests/debugger-pause-on-for-statements.html
+++ b/content/browser/debugger/manual_tests/debugger-pause-on-for-statements.html
diff --git a/chrome/browser/debugger/manual_tests/debugger-step-on-do-while-statements.html b/content/browser/debugger/manual_tests/debugger-step-on-do-while-statements.html
index f60dd6a..f60dd6a 100644
--- a/chrome/browser/debugger/manual_tests/debugger-step-on-do-while-statements.html
+++ b/content/browser/debugger/manual_tests/debugger-step-on-do-while-statements.html
diff --git a/chrome/browser/debugger/manual_tests/debugger-step-on-for-in-statements.html b/content/browser/debugger/manual_tests/debugger-step-on-for-in-statements.html
index e360394..e360394 100644
--- a/chrome/browser/debugger/manual_tests/debugger-step-on-for-in-statements.html
+++ b/content/browser/debugger/manual_tests/debugger-step-on-for-in-statements.html
diff --git a/chrome/browser/debugger/manual_tests/debugger-step-on-for-statements.html b/content/browser/debugger/manual_tests/debugger-step-on-for-statements.html
index 75289e5f..75289e5f 100644
--- a/chrome/browser/debugger/manual_tests/debugger-step-on-for-statements.html
+++ b/content/browser/debugger/manual_tests/debugger-step-on-for-statements.html
diff --git a/chrome/browser/debugger/manual_tests/debugger-step-on-while-statements.html b/content/browser/debugger/manual_tests/debugger-step-on-while-statements.html
index 7967172..7967172 100644
--- a/chrome/browser/debugger/manual_tests/debugger-step-on-while-statements.html
+++ b/content/browser/debugger/manual_tests/debugger-step-on-while-statements.html
diff --git a/chrome/browser/debugger/manual_tests/debugger-watch-expressions.html b/content/browser/debugger/manual_tests/debugger-watch-expressions.html
index a2e9258..a2e9258 100644
--- a/chrome/browser/debugger/manual_tests/debugger-watch-expressions.html
+++ b/content/browser/debugger/manual_tests/debugger-watch-expressions.html
diff --git a/chrome/browser/debugger/manual_tests/dom-mutation.html b/content/browser/debugger/manual_tests/dom-mutation.html
index a03b03c..a03b03c 100644
--- a/chrome/browser/debugger/manual_tests/dom-mutation.html
+++ b/content/browser/debugger/manual_tests/dom-mutation.html
diff --git a/chrome/browser/debugger/manual_tests/element-styles.html b/content/browser/debugger/manual_tests/element-styles.html
index cb33919..cb33919 100644
--- a/chrome/browser/debugger/manual_tests/element-styles.html
+++ b/content/browser/debugger/manual_tests/element-styles.html
diff --git a/chrome/browser/debugger/manual_tests/error-warning-count.html b/content/browser/debugger/manual_tests/error-warning-count.html
index 3296742..3296742 100644
--- a/chrome/browser/debugger/manual_tests/error-warning-count.html
+++ b/content/browser/debugger/manual_tests/error-warning-count.html
diff --git a/chrome/browser/debugger/manual_tests/event-listeners.html b/content/browser/debugger/manual_tests/event-listeners.html
index 4dff96d..4dff96d 100644
--- a/chrome/browser/debugger/manual_tests/event-listeners.html
+++ b/content/browser/debugger/manual_tests/event-listeners.html
diff --git a/chrome/browser/debugger/manual_tests/heap-profiler-test-basic-grid-functionality.html b/content/browser/debugger/manual_tests/heap-profiler-test-basic-grid-functionality.html
index 5aa4555..5aa4555 100644
--- a/chrome/browser/debugger/manual_tests/heap-profiler-test-basic-grid-functionality.html
+++ b/content/browser/debugger/manual_tests/heap-profiler-test-basic-grid-functionality.html
diff --git a/chrome/browser/debugger/manual_tests/heap-profiler-test-snapshots-comparison.html b/content/browser/debugger/manual_tests/heap-profiler-test-snapshots-comparison.html
index 3a419d4e..3a419d4e 100644
--- a/chrome/browser/debugger/manual_tests/heap-profiler-test-snapshots-comparison.html
+++ b/content/browser/debugger/manual_tests/heap-profiler-test-snapshots-comparison.html
diff --git a/chrome/browser/debugger/manual_tests/highlight-nodes.html b/content/browser/debugger/manual_tests/highlight-nodes.html
index cbeae6f..cbeae6f 100644
--- a/chrome/browser/debugger/manual_tests/highlight-nodes.html
+++ b/content/browser/debugger/manual_tests/highlight-nodes.html
diff --git a/chrome/browser/debugger/manual_tests/highlight-source-line.html b/content/browser/debugger/manual_tests/highlight-source-line.html
index a56ed97..a56ed97 100644
--- a/chrome/browser/debugger/manual_tests/highlight-source-line.html
+++ b/content/browser/debugger/manual_tests/highlight-source-line.html
diff --git a/chrome/browser/debugger/manual_tests/profiler-test-basic-grid-functionality.html b/content/browser/debugger/manual_tests/profiler-test-basic-grid-functionality.html
index 1841715..1841715 100644
--- a/chrome/browser/debugger/manual_tests/profiler-test-basic-grid-functionality.html
+++ b/content/browser/debugger/manual_tests/profiler-test-basic-grid-functionality.html
diff --git a/chrome/browser/debugger/manual_tests/profiler-test-console-control.html b/content/browser/debugger/manual_tests/profiler-test-console-control.html
index 4f2001a..4f2001a 100644
--- a/chrome/browser/debugger/manual_tests/profiler-test-console-control.html
+++ b/content/browser/debugger/manual_tests/profiler-test-console-control.html
diff --git a/chrome/browser/debugger/manual_tests/profiler-test-focus-and-exclude.html b/content/browser/debugger/manual_tests/profiler-test-focus-and-exclude.html
index d33e3eb..d33e3eb 100644
--- a/chrome/browser/debugger/manual_tests/profiler-test-focus-and-exclude.html
+++ b/content/browser/debugger/manual_tests/profiler-test-focus-and-exclude.html
diff --git a/chrome/browser/debugger/manual_tests/profiler-test-re-opening.html b/content/browser/debugger/manual_tests/profiler-test-re-opening.html
index a615afa..a615afa 100644
--- a/chrome/browser/debugger/manual_tests/profiler-test-re-opening.html
+++ b/content/browser/debugger/manual_tests/profiler-test-re-opening.html
diff --git a/chrome/browser/debugger/manual_tests/resources/fib.js b/content/browser/debugger/manual_tests/resources/fib.js
index 804c866..804c866 100644
--- a/chrome/browser/debugger/manual_tests/resources/fib.js
+++ b/content/browser/debugger/manual_tests/resources/fib.js
diff --git a/chrome/browser/debugger/manual_tests/resources/loop-statements.js b/content/browser/debugger/manual_tests/resources/loop-statements.js
index cbb4e0d..cbb4e0d 100644
--- a/chrome/browser/debugger/manual_tests/resources/loop-statements.js
+++ b/content/browser/debugger/manual_tests/resources/loop-statements.js
diff --git a/chrome/browser/debugger/manual_tests/resources/mutate-frame-2.html b/content/browser/debugger/manual_tests/resources/mutate-frame-2.html
index 9d413b9..9d413b9 100644
--- a/chrome/browser/debugger/manual_tests/resources/mutate-frame-2.html
+++ b/content/browser/debugger/manual_tests/resources/mutate-frame-2.html
diff --git a/chrome/browser/debugger/manual_tests/resources/mutate-frame.html b/content/browser/debugger/manual_tests/resources/mutate-frame.html
index 08fc656..08fc656 100644
--- a/chrome/browser/debugger/manual_tests/resources/mutate-frame.html
+++ b/content/browser/debugger/manual_tests/resources/mutate-frame.html
diff --git a/chrome/browser/debugger/manual_tests/resources/primes.js b/content/browser/debugger/manual_tests/resources/primes.js
index 64d38dc..64d38dc 100644
--- a/chrome/browser/debugger/manual_tests/resources/primes.js
+++ b/content/browser/debugger/manual_tests/resources/primes.js
diff --git a/chrome/browser/debugger/manual_tests/resources/script-console-calls.js b/content/browser/debugger/manual_tests/resources/script-console-calls.js
index 9c7bc35..9c7bc35 100644
--- a/chrome/browser/debugger/manual_tests/resources/script-console-calls.js
+++ b/content/browser/debugger/manual_tests/resources/script-console-calls.js
diff --git a/chrome/browser/debugger/manual_tests/resources/worker-primes.js b/content/browser/debugger/manual_tests/resources/worker-primes.js
index 8be021f..8be021f 100644
--- a/chrome/browser/debugger/manual_tests/resources/worker-primes.js
+++ b/content/browser/debugger/manual_tests/resources/worker-primes.js
diff --git a/content/browser/renderer_host/async_resource_handler.cc b/content/browser/renderer_host/async_resource_handler.cc
index aaaedf0..87083b9 100644
--- a/content/browser/renderer_host/async_resource_handler.cc
+++ b/content/browser/renderer_host/async_resource_handler.cc
@@ -10,7 +10,7 @@
 #include "base/hash_tables.h"
 #include "base/logging.h"
 #include "base/shared_memory.h"
-#include "chrome/browser/debugger/devtools_netlog_observer.h"
+#include "content/browser/debugger/devtools_netlog_observer.h"
 #include "content/browser/host_zoom_map.h"
 #include "content/browser/renderer_host/global_request_id.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
diff --git a/content/browser/renderer_host/sync_resource_handler.cc b/content/browser/renderer_host/sync_resource_handler.cc
index d0dd937..685bde3 100644
--- a/content/browser/renderer_host/sync_resource_handler.cc
+++ b/content/browser/renderer_host/sync_resource_handler.cc
@@ -5,7 +5,7 @@
 #include "content/browser/renderer_host/sync_resource_handler.h"
 
 #include "base/logging.h"
-#include "chrome/browser/debugger/devtools_netlog_observer.h"
+#include "content/browser/debugger/devtools_netlog_observer.h"
 #include "content/browser/renderer_host/global_request_id.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_delegate.h"
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 29bea5dc..813476f 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -13,10 +13,10 @@
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/content_browser_client.h"
+#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/host_zoom_map.h"
 #include "content/browser/in_process_webkit/session_storage_namespace.h"
 #include "content/browser/load_from_memory_cache_details.h"
diff --git a/tools/grit/resource_ids b/tools/grit/resource_ids
index 879bb13..0b70f9f 100644
--- a/tools/grit/resource_ids
+++ b/tools/grit/resource_ids
@@ -139,7 +139,7 @@
     "includes": [21000],
   },
   # This file is generated during the build.
-  "chrome/browser/debugger/frontend/devtools_frontend_resources.grd": {
+  "content/browser/debugger/frontend/devtools_frontend_resources.grd": {
     "includes": [21500],
   },
   "chrome/browser/resources/options_resources.grd": {
author	joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2011-06-29 02:16:06 +0000
committer	joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2011-06-29 02:16:06 +0000
commit	b46442d7e2e8cccf5f9bcafb2e1e3b7cf23d424b (patch)
tree	e1e0f0d2fc3653d71e93b4cca71cce5ea2cb7223
parent	75a4e77f6c2c21706c09948269c45d98db28757b (diff)
download	chromium_src-b46442d7e2e8cccf5f9bcafb2e1e3b7cf23d424b.zip chromium_src-b46442d7e2e8cccf5f9bcafb2e1e3b7cf23d424b.tar.gz chromium_src-b46442d7e2e8cccf5f9bcafb2e1e3b7cf23d424b.tar.bz2