DevTools: rename debugger/ to devtools/, move DevTools files into content/renderer/devtools.

Review URL: https://codereview.chromium.org/11630004


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

126 files changed, 194 insertions, 1142 deletions

diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 12066d7..b84cf06 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -37,7 +37,7 @@
       'target_name': 'android_webview_pak',
       'type': 'none',
       'dependencies': [
-        '<(DEPTH)/content/browser/debugger/devtools_resources.gyp:devtools_resources',
+        '<(DEPTH)/content/browser/devtools/devtools_resources.gyp:devtools_resources',
         '<(DEPTH)/content/content_resources.gyp:content_resources',
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 2bfddae..03f1b34 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -43,7 +43,7 @@
 #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_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index bd0b15e..f4a72dd 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -26,8 +26,8 @@
 #include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/component_updater/component_updater_configurator.h"
 #include "chrome/browser/component_updater/component_updater_service.h"
-#include "chrome/browser/debugger/remote_debugging_server.h"
 #include "chrome/browser/defaults.h"
+#include "chrome/browser/devtools/remote_debugging_server.h"
 #include "chrome/browser/download/download_request_limiter.h"
 #include "chrome/browser/download/download_status_updater.h"
 #include "chrome/browser/extensions/event_router_forwarder.h"
diff --git a/content/browser/debugger/OWNERS b/chrome/browser/devtools/OWNERS
index 1b8b683..bb6028e 100644
--- a/content/browser/debugger/OWNERS
+++ b/chrome/browser/devtools/OWNERS
@@ -1,3 +1,2 @@
-joi@chromium.org
 pfeldman@chromium.org
 yurys@chromium.org
diff --git a/chrome/browser/debugger/browser_list_tabcontents_provider.cc b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
index 145728c..7390453 100644
--- a/chrome/browser/debugger/browser_list_tabcontents_provider.cc
+++ b/chrome/browser/devtools/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 "chrome/browser/devtools/browser_list_tabcontents_provider.h"
 
 #include "base/path_service.h"
 #include "chrome/browser/history/top_sites.h"
diff --git a/chrome/browser/debugger/browser_list_tabcontents_provider.h b/chrome/browser/devtools/browser_list_tabcontents_provider.h
index e6e8039..a09af44 100644
--- a/chrome/browser/debugger/browser_list_tabcontents_provider.h
+++ b/chrome/browser/devtools/browser_list_tabcontents_provider.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 CHROME_BROWSER_DEBUGGER_BROWSER_LIST_TABCONTENTS_PROVIDER_H_
-#define CHROME_BROWSER_DEBUGGER_BROWSER_LIST_TABCONTENTS_PROVIDER_H_
+#ifndef CHROME_BROWSER_DEVTOOLS_BROWSER_LIST_TABCONTENTS_PROVIDER_H_
+#define CHROME_BROWSER_DEVTOOLS_BROWSER_LIST_TABCONTENTS_PROVIDER_H_
 
 #include <set>
 #include <string>
@@ -32,4 +32,4 @@ class BrowserListTabContentsProvider
   DISALLOW_COPY_AND_ASSIGN(BrowserListTabContentsProvider);
 };
 
-#endif  // CHROME_BROWSER_DEBUGGER_BROWSER_LIST_TABCONTENTS_PROVIDER_H_
+#endif  // CHROME_BROWSER_DEVTOOLS_BROWSER_LIST_TABCONTENTS_PROVIDER_H_
diff --git a/chrome/browser/debugger/devtools_file_helper.cc b/chrome/browser/devtools/devtools_file_helper.cc
index 2acebea..6eab113 100644
--- a/chrome/browser/debugger/devtools_file_helper.cc
+++ b/chrome/browser/devtools/devtools_file_helper.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_helper.h"
+#include "chrome/browser/devtools/devtools_file_helper.h"
 
 #include <vector>
 
diff --git a/chrome/browser/debugger/devtools_file_helper.h b/chrome/browser/devtools/devtools_file_helper.h
index 641ca5c..3c1e9dc 100644
--- a/chrome/browser/debugger/devtools_file_helper.h
+++ b/chrome/browser/devtools/devtools_file_helper.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 CHROME_BROWSER_DEBUGGER_DEVTOOLS_FILE_HELPER_H_
-#define CHROME_BROWSER_DEBUGGER_DEVTOOLS_FILE_HELPER_H_
+#ifndef CHROME_BROWSER_DEVTOOLS_DEVTOOLS_FILE_HELPER_H_
+#define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_FILE_HELPER_H_
 
 #include <map>
 #include <string>
@@ -57,4 +57,4 @@ class DevToolsFileHelper {
   DISALLOW_COPY_AND_ASSIGN(DevToolsFileHelper);
 };
 
-#endif  // CHROME_BROWSER_DEBUGGER_DEVTOOLS_FILE_HELPER_H_
+#endif  // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_FILE_HELPER_H_
diff --git a/chrome/browser/debugger/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index 4266e66..73c6249 100644
--- a/chrome/browser/debugger/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -11,7 +11,7 @@
 #include "base/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
diff --git a/chrome/browser/debugger/devtools_toggle_action.h b/chrome/browser/devtools/devtools_toggle_action.h
index 83fbb5f..ff5c94c 100644
--- a/chrome/browser/debugger/devtools_toggle_action.h
+++ b/chrome/browser/devtools/devtools_toggle_action.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 CHROME_BROWSER_DEBUGGER_DEVTOOLS_TOGGLE_ACTION_H_
-#define CHROME_BROWSER_DEBUGGER_DEVTOOLS_TOGGLE_ACTION_H_
+#ifndef CHROME_BROWSER_DEVTOOLS_DEVTOOLS_TOGGLE_ACTION_H_
+#define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_TOGGLE_ACTION_H_
 
 enum DevToolsToggleAction {
   DEVTOOLS_TOGGLE_ACTION_SHOW,
@@ -12,4 +12,4 @@ enum DevToolsToggleAction {
   DEVTOOLS_TOGGLE_ACTION_TOGGLE
 };
 
-#endif  // CHROME_BROWSER_DEBUGGER_DEVTOOLS_TOGGLE_ACTION_H_
+#endif  // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_TOGGLE_ACTION_H_
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index 3001b6b..18d33ad 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -12,7 +12,7 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/api/debugger/debugger_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/devtools/devtools_window.h
index b0b72a0..06033f7 100644
--- a/chrome/browser/debugger/devtools_window.h
+++ b/chrome/browser/devtools/devtools_window.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
-#define CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
+#ifndef CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
+#define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/debugger/devtools_file_helper.h"
-#include "chrome/browser/debugger/devtools_toggle_action.h"
+#include "chrome/browser/devtools/devtools_file_helper.h"
+#include "chrome/browser/devtools/devtools_toggle_action.h"
 #include "content/public/browser/devtools_client_host.h"
 #include "content/public/browser/devtools_frontend_host_delegate.h"
 #include "content/public/browser/notification_observer.h"
@@ -211,4 +211,4 @@ class DevToolsWindow : private content::NotificationObserver,
   DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
 };
 
-#endif  // CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
+#endif  // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
diff --git a/chrome/browser/debugger/frontend/devtools_discovery_page.html b/chrome/browser/devtools/frontend/devtools_discovery_page.html
index 85c03b8..85c03b8 100644
--- a/chrome/browser/debugger/frontend/devtools_discovery_page.html
+++ b/chrome/browser/devtools/frontend/devtools_discovery_page.html
diff --git a/chrome/browser/debugger/frontend/devtools_discovery_page_resources.grd b/chrome/browser/devtools/frontend/devtools_discovery_page_resources.grd
index 85ad2aa..85ad2aa 100644
--- a/chrome/browser/debugger/frontend/devtools_discovery_page_resources.grd
+++ b/chrome/browser/devtools/frontend/devtools_discovery_page_resources.grd
diff --git a/chrome/browser/debugger/remote_debugging_server.cc b/chrome/browser/devtools/remote_debugging_server.cc
index b951206..2d05199 100644
--- a/chrome/browser/debugger/remote_debugging_server.cc
+++ b/chrome/browser/devtools/remote_debugging_server.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/debugger/remote_debugging_server.h"
+#include "chrome/browser/devtools/remote_debugging_server.h"
 
-#include "chrome/browser/debugger/browser_list_tabcontents_provider.h"
+#include "chrome/browser/devtools/browser_list_tabcontents_provider.h"
 #include "chrome/browser/ui/webui/devtools_ui.h"
 #include "content/public/browser/devtools_http_handler.h"
 #include "net/base/tcp_listen_socket.h"
diff --git a/chrome/browser/debugger/remote_debugging_server.h b/chrome/browser/devtools/remote_debugging_server.h
index e1c2785..d872f29 100644
--- a/chrome/browser/debugger/remote_debugging_server.h
+++ b/chrome/browser/devtools/remote_debugging_server.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 CHROME_BROWSER_DEBUGGER_REMOTE_DEBUGGING_SERVER_H_
-#define CHROME_BROWSER_DEBUGGER_REMOTE_DEBUGGING_SERVER_H_
+#ifndef CHROME_BROWSER_DEVTOOLS_REMOTE_DEBUGGING_SERVER_H_
+#define CHROME_BROWSER_DEVTOOLS_REMOTE_DEBUGGING_SERVER_H_
 
 #include <string>
 
@@ -29,4 +29,4 @@ class RemoteDebuggingServer {
   DISALLOW_COPY_AND_ASSIGN(RemoteDebuggingServer);
 };
 
-#endif  // CHROME_BROWSER_DEBUGGER_REMOTE_DEBUGGING_SERVER_H_
+#endif  // CHROME_BROWSER_DEVTOOLS_REMOTE_DEBUGGING_SERVER_H_
diff --git a/chrome/browser/extensions/api/app_window/app_window_api.cc b/chrome/browser/extensions/api/app_window/app_window_api.cc
index d474f50..0c94ff6 100644
--- a/chrome/browser/extensions/api/app_window/app_window_api.cc
+++ b/chrome/browser/extensions/api/app_window/app_window_api.cc
@@ -7,7 +7,7 @@
 #include "base/command_line.h"
 #include "base/time.h"
 #include "base/values.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/ui/extensions/native_app_window.h"
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
index 7c006e6..8732781 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
@@ -7,7 +7,7 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/api/developer_private/developer_private_api_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 5b9d714..11e2c9d 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -30,7 +30,7 @@
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_plugin_service_filter.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h"
 #include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
 #include "chrome/browser/extensions/api/extension_action/extension_actions_api.h"
diff --git a/chrome/browser/extensions/platform_app_browsertest.cc b/chrome/browser/extensions/platform_app_browsertest.cc
index 7902b4f..b658083 100644
--- a/chrome/browser/extensions/platform_app_browsertest.cc
+++ b/chrome/browser/extensions/platform_app_browsertest.cc
@@ -8,7 +8,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/automation/automation_util.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/api/permissions/permissions_api.h"
 #include "chrome/browser/extensions/app_restore_service_factory.h"
 #include "chrome/browser/extensions/app_restore_service.h"
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 2789aba..8632a2d2 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -22,7 +22,7 @@
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 153d286..7247c6a 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/chrome_content_browser_client.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_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/tabs/tabs.h"
diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc
index 689da2d..774f63d 100644
--- a/chrome/browser/printing/print_dialog_cloud.cc
+++ b/chrome/browser/printing/print_dialog_cloud.cc
@@ -13,7 +13,7 @@
 #include "base/json/json_reader.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
index 9bab39f..0a0adcc 100644
--- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
+++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
@@ -7,7 +7,7 @@
 #include <cmath>
 
 #include "base/sys_string_conversions.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/spellchecker/spellcheck_platform_mac.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 8595857..7ed2efd 100644
--- a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
+++ b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/command_line.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index e9e2b75..3a39e5e 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -21,7 +21,7 @@
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_util.h"
diff --git a/chrome/browser/task_manager/task_manager_notification_resource_provider.cc b/chrome/browser/task_manager/task_manager_notification_resource_provider.cc
index 8fbbce0..748cca6 100644
--- a/chrome/browser/task_manager/task_manager_notification_resource_provider.cc
+++ b/chrome/browser/task_manager/task_manager_notification_resource_provider.cc
@@ -7,7 +7,7 @@
 #include "base/basictypes.h"
 #include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/notifications/balloon_host.h"
diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc
index cc4f580..75e7671 100644
--- a/chrome/browser/task_manager/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager/task_manager_resource_providers.cc
@@ -22,7 +22,7 @@
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/task_manager/task_manager_worker_resource_provider.cc b/chrome/browser/task_manager/task_manager_worker_resource_provider.cc
index 514e0f3..83723ce 100644
--- a/chrome/browser/task_manager/task_manager_worker_resource_provider.cc
+++ b/chrome/browser/task_manager/task_manager_worker_resource_provider.cc
@@ -9,7 +9,7 @@
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_data.h"
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index f1d1d7d..a7f6cf9 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -41,8 +41,8 @@
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h"
-#include "chrome/browser/debugger/devtools_toggle_action.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_toggle_action.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/download/download_crx_util.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_service.h"
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 735fd96..e9f2ce9 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -18,7 +18,7 @@
 #include "base/prefs/public/pref_change_registrar.h"
 #include "base/prefs/public/pref_member.h"
 #include "base/string16.h"
-#include "chrome/browser/debugger/devtools_toggle_action.h"
+#include "chrome/browser/devtools/devtools_toggle_action.h"
 #include "chrome/browser/event_disposition.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.h"
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 49ade84..e657147a 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/chrome_page_zoom.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/tab_helper.h"
diff --git a/chrome/browser/ui/browser_commands.h b/chrome/browser/ui/browser_commands.h
index 6776240c..3b362c4 100644
--- a/chrome/browser/ui/browser_commands.h
+++ b/chrome/browser/ui/browser_commands.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "chrome/browser/debugger/devtools_toggle_action.h"
+#include "chrome/browser/devtools/devtools_toggle_action.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "content/public/common/page_zoom.h"
 #include "webkit/glue/window_open_disposition.h"
diff --git a/chrome/browser/ui/cocoa/dev_tools_controller.h b/chrome/browser/ui/cocoa/dev_tools_controller.h
index 3f27c5dec..05e3241 100644
--- a/chrome/browser/ui/cocoa/dev_tools_controller.h
+++ b/chrome/browser/ui/cocoa/dev_tools_controller.h
@@ -8,7 +8,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_nsobject.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 
 @class NSSplitView;
 @class NSView;
diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
index 948f706..12d24a604d 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_system.h"
diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm
index d85d5ed..f9adc9f 100644
--- a/chrome/browser/ui/cocoa/tabpose_window.mm
+++ b/chrome/browser/ui/cocoa/tabpose_window.mm
@@ -14,7 +14,7 @@
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index d80f004..83d2dd3 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -19,7 +19,7 @@
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/net/url_fixer_upper.h"
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.h b/chrome/browser/ui/gtk/browser_window_gtk.h
index 5203eed..1900b93 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.h
+++ b/chrome/browser/ui/gtk/browser_window_gtk.h
@@ -15,7 +15,7 @@
 #include "base/prefs/public/pref_member.h"
 #include "base/timer.h"
 #include "build/build_config.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/infobars/infobar_container.h"
 #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc
index 006657b..e0b0605 100644
--- a/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc
+++ b/chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc
@@ -13,7 +13,7 @@
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_system.h"
diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc
index 5780b16..35900ca 100644
--- a/chrome/browser/ui/panels/panel.cc
+++ b/chrome/browser/ui/panels/panel.cc
@@ -8,7 +8,7 @@
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"
 #include "chrome/browser/extensions/api/tabs/windows_event_router.h"
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index ed945b4..228ca2b 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -5,7 +5,7 @@
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prefs/browser_prefs.h"
diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc
index 12461f7..f9ea609 100644
--- a/chrome/browser/ui/views/extensions/extension_popup.cc
+++ b/chrome/browser/ui/views/extensions/extension_popup.cc
@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/message_loop.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/platform_util.h"
diff --git a/chrome/browser/ui/views/external_tab_container_win.cc b/chrome/browser/ui/views/external_tab_container_win.cc
index a6aa395..3d66c3e 100644
--- a/chrome/browser/ui/views/external_tab_container_win.cc
+++ b/chrome/browser/ui/views/external_tab_container_win.cc
@@ -19,8 +19,8 @@
 #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_toggle_action.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_toggle_action.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/history/history_tab_helper.h"
 #include "chrome/browser/history/history_types.h"
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index 7fa6ca9..0590ca0 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -13,7 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
 #include "build/build_config.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/infobars/infobar_container.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
index fa4f929..fef8fa1 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -16,7 +16,7 @@
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_disabled_ui.h"
diff --git a/chrome/browser/ui/webui/inspect_ui.cc b/chrome/browser/ui/webui/inspect_ui.cc
index 877292d..f677218 100644
--- a/chrome/browser/ui/webui/inspect_ui.cc
+++ b/chrome/browser/ui/webui/inspect_ui.cc
@@ -14,7 +14,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index e5a31f5..6e0cb29 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -206,15 +206,15 @@
             '..',
           ],
           'sources': [
-            'browser/debugger/browser_list_tabcontents_provider.cc',
-            'browser/debugger/browser_list_tabcontents_provider.h',
-            'browser/debugger/devtools_file_helper.cc',
-            'browser/debugger/devtools_file_helper.h',
-            'browser/debugger/devtools_toggle_action.h',
-            'browser/debugger/devtools_window.cc',
-            'browser/debugger/devtools_window.h',
-            'browser/debugger/remote_debugging_server.cc',
-            'browser/debugger/remote_debugging_server.h',
+            'browser/devtools/browser_list_tabcontents_provider.cc',
+            'browser/devtools/browser_list_tabcontents_provider.h',
+            'browser/devtools/devtools_file_helper.cc',
+            'browser/devtools/devtools_file_helper.h',
+            'browser/devtools/devtools_toggle_action.h',
+            'browser/devtools/devtools_window.cc',
+            'browser/devtools/devtools_window.h',
+            'browser/devtools/remote_debugging_server.cc',
+            'browser/devtools/remote_debugging_server.h',
           ],
           'conditions': [
             ['toolkit_uses_gtk == 1', {
@@ -224,9 +224,9 @@
             }],
             ['OS=="android"', {
               'sources!': [
-                'browser/debugger/browser_list_tabcontents_provider.cc',
-                'browser/debugger/devtools_window.cc',
-                'browser/debugger/remote_debugging_server.cc',
+                'browser/devtools/browser_list_tabcontents_provider.cc',
+                'browser/devtools/devtools_window.cc',
+                'browser/devtools/remote_debugging_server.cc',
               ],
             }],
             ['debug_devtools==1', {
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 1f8fd41..7b7d29c 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -47,7 +47,7 @@
       'conditions': [
         ['OS != "ios"', {
           'dependencies': [
-            '../content/browser/debugger/devtools_resources.gyp:devtools_resources',
+            '../content/browser/devtools/devtools_resources.gyp:devtools_resources',
           ],
           'actions': [
             {
@@ -75,7 +75,7 @@
               'action_name': 'devtools_discovery_page_resources',
               'variables': {
                 'grit_grd_file':
-                   'browser/debugger/frontend/devtools_discovery_page_resources.grd',
+                   'browser/devtools/frontend/devtools_discovery_page_resources.grd',
               },
               'includes': [ '../build/grit_action.gypi' ]
             },
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index e012e4e..30758a3 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -925,7 +925,7 @@
         'browser/content_settings/content_settings_browsertest.cc',
         'browser/crash_recovery_browsertest.cc',
         'browser/custom_handlers/protocol_handler_registry_browsertest.cc',
-        'browser/debugger/devtools_sanity_browsertest.cc',
+        'browser/devtools/devtools_sanity_browsertest.cc',
         'browser/do_not_track_browsertest.cc',
         'browser/download/download_browsertest.cc',
         'browser/download/download_danger_prompt_browsertest.cc',
diff --git a/content/browser/debugger/manual_tests/console-call-line-numbers.html b/content/browser/debugger/manual_tests/console-call-line-numbers.html
deleted file mode 100644
index 98bb918..0000000
--- a/content/browser/debugger/manual_tests/console-call-line-numbers.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<script>
-    console.info("Test console.info");
-    console.log("Test console.log");
-    console.warn("Test console.warn");
-    console.error("Test console.error");
-    console.time("Test console.time");
-    console.timeEnd("Test console.time");
-    console.count("Test console.count");
-    console.assert(false, "Test console.assert");
-</script>
-<script src="resources/script-console-calls.js"></script>
-
-<p>To test, open the DevTools's Console (Ctrl+Shift+J) and verify that all console messages have correct
-resource URLs and line numbers. Also verify that errors and warnings show up inline as bubbles in the
-Resource panel file list and each individual resource view.</p>
diff --git a/content/browser/debugger/manual_tests/debugger-exception-on-load.html b/content/browser/debugger/manual_tests/debugger-exception-on-load.html
deleted file mode 100644
index ef2384f..0000000
--- a/content/browser/debugger/manual_tests/debugger-exception-on-load.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-debugger; // You should see this code and execution line in the Scripts panel. Click Resume (Play/Pause button to the right).
-</script>
-
-<p>To test, open the DevTools (Ctrl+Shift+I) and reload the page. You should see this file and execution line in the Scripts panel.</p>
diff --git a/content/browser/debugger/manual_tests/debugger-execution-while-paused.html b/content/browser/debugger/manual_tests/debugger-execution-while-paused.html
deleted file mode 100644
index f33abea..0000000
--- a/content/browser/debugger/manual_tests/debugger-execution-while-paused.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<script>
-function stepOne()
-{
-    console.log(1);
-}
-
-function stepTwo()
-{
-    alert("Test failed. The second button event still fired.");
-}
-</script>
-
-<p>To test, open the DevTools (Ctrl+Shift+I) and reload the page. Set a break point inside the stepOne() function.
-Now click the Step One button in the page. The breakpoint should be hit. While paused at the breakpoint
-click on the Step Two button. You should not see an alert dialog. Continue script.</p>
-<button onclick="stepOne()">Step One</button><br><br>
-<button onclick="stepTwo()">Step Two</button>
diff --git a/content/browser/debugger/manual_tests/debugger-fake-workers.html b/content/browser/debugger/manual_tests/debugger-fake-workers.html
deleted file mode 100644
index 6a7cb03..0000000
--- a/content/browser/debugger/manual_tests/debugger-fake-workers.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<html>
-<body onload="onLoad()">
-<script>
-
-function log(message) {
-  var div = document.createElement('div');
-  div.innerText = message;
-  document.getElementById('console').appendChild(div);
-}
-
-function strike(id) {
-  document.getElementById(id).style.textDecoration = "line-through"
-}
-
-function onLoad() {
-  if (!Worker.prototype.postMessage) { // fake workers
-      strike('s1');
-      strike('s2');
-      log('[using fake workers]');
-  } else {
-      log('[using real workers]');
-  }
-}
-
-var primeWorker;
-var invalidWorker;
-var count;
-var timer;
-
-function startWorkers() {
-  startButton.disabled = true;
-
-  primeWorker = new Worker('resources/worker-primes.js');                         	
-  primeWorker.onmessage = onMessage;
-  primeWorker.onerror = onError;
-  primeWorker.postMessage(2);
-  count = 3;
-
-  timer = setInterval(onTimer, 1000);
-  try {
-    invalidWorker = new Worker('non-existent-worker.js');
-  } catch(e) {
-  }
-  log('Started worker');
-}
-
-function onTimer() {
-  primeWorker.postMessage(count);
-  count+=2;
-}
-
-function onMessage(event) {
-  if (event.data[1]) {
-    log(event.data[0]);
-    if (event.data[0] === 5)
-      strike('s6');
-  }
-}
-
-function onError(event) {
-  log('Error in worker: ' + event.message);
-  strike('s8');
-}
-
-function causeError() {
-  primeWorker.postMessage('forty two');
-}
-
-function stopWorker() {
-  log('Stopping worker...');
-  if (timer) {
-    clearInterval(timer);
-    timer = 0;
-  }
-  primeWorker.terminate();
-  startButton.disabled = false;
-}
-
-</script>
-
-<h1>Tests debugging of HTML5 Workers</h1>
-
-<ol>
-
-<li id="s1">Open DevTools, Scripts Panel; Tick Debug on Workers sidebar.</li>
-<li id="s2">Reload the page.</li>
-<li id="s3"><button onclick="startWorkers()" id="startButton">Start Worker</button></li>
-<li id="s4">Observe 2 workers appear in the worker sidebar pane (including non-existent-worker.js)"</li>
-<li id="s5">Observe worker-primes.js and primes.js appear in scripts drop-down box.</li>
-<li id="s6">Assure primes are being logged to test console below.</li>
-<li id="s7">Set a breakpoint on one of worker scripts, assure it's hit.</li>
-<li id="s8">Try causing an error in worker, observe it's logged in DevTools console and in test console below.
-  <button onclick="causeError()">Cause Error</button>
-<li id="s9"><button onclick="stopWorker()">Stop Worker</button></li>
-
-</ol>
-
-<div id="console" style="font-family: courier; background-color: black; color: green; width: 80em; height: 25em; overflow: scroll">
-</div>
-
-</body>
-</html>
diff --git a/content/browser/debugger/manual_tests/debugger-pause-on-else-statements.html b/content/browser/debugger/manual_tests/debugger-pause-on-else-statements.html
deleted file mode 100644
index 3c80a43..0000000
--- a/content/browser/debugger/manual_tests/debugger-pause-on-else-statements.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<script>
-function test()
-{
-    debugger;
-}
-
-if (false)
-    debugger; // This should not be hit.
-else
-    test();
-</script>
-
-<p>To test, open the DevTools (Ctrl+Shift+I) and reload the page. When the debugger breaks, select the (anonymous function) node
-in the call stack, you should see the execution line on the call to test().</p>
-<br><br>
-Also set a breakpoint on the call to test(), and reload. It should break before the test() function is called.
diff --git a/content/browser/debugger/manual_tests/debugger-pause-on-for-in-statements.html b/content/browser/debugger/manual_tests/debugger-pause-on-for-in-statements.html
deleted file mode 100644
index 79f7983..0000000
--- a/content/browser/debugger/manual_tests/debugger-pause-on-for-in-statements.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<script>
-function test()
-{
-    debugger;
-}
-
-var object = { test: 1 };
-
-for (var property in object)
-    test();
-</script>
-
-<p>To test, open the DevTools (Ctrl+Shift+I) and reload the page. When the debugger breaks, select
-the (anonymous function) node in the call stack, you should see the execution line on the call to test().
-<br><br>
-Also set a breakpoint on the call to test(), and reload. It should break before the test() function is called.
diff --git a/content/browser/debugger/manual_tests/debugger-pause-on-for-statements.html b/content/browser/debugger/manual_tests/debugger-pause-on-for-statements.html
deleted file mode 100644
index 1a9e274..0000000
--- a/content/browser/debugger/manual_tests/debugger-pause-on-for-statements.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<script>
-function test()
-{
-    debugger;
-}
-
-for (var i = 0; i < 1; ++i)
-    test();
-</script>
-
-<p>To test, open the DevTools (Ctrl+Shift+I) and reload the page. When the debugger breaks, select the
-(anonymous function) node in the call stack, you should see the execution line on the call to test().</p>
-<br><br>
-Also set a breakpoint on the call to test(), and reload. It should break before the test() function is called.
diff --git a/content/browser/debugger/manual_tests/debugger-step-on-do-while-statements.html b/content/browser/debugger/manual_tests/debugger-step-on-do-while-statements.html
deleted file mode 100644
index f60dd6a..0000000
--- a/content/browser/debugger/manual_tests/debugger-step-on-do-while-statements.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<script src="resources/loop-statements.js"></script>
-<script>            
-function runDoWhile()
-{
-    /* place breakpoint on next line and click continue */ debugger;
-    do {
-        statement();
-        increment();
-    } while (condition());
-}
-
-</script>
-<p>To test, open the DevTools (Ctrl+Shift+I) and reload the page.
-<br><br>
-Before running the tests please perform the following:
-Make sure the execution is not paused in the debugger.<br>
-Click the button and when the debugger breaks, set a breakpoint on the first line in the loop
-(as indicated by the comment), and click continue.<br>
-The debugger should stop at the beggining of the loop.<br>
-The above actions should be performed before <b>each</b> of the following tests.</p>
-<br><br>
-<input type="button" value="run do-while" onclick="initialize();runDoWhile()"/>
-<br><br>
-TEST 1: Click 'continue'. Execution should continue without stopping on the loop breakpoint again.<br>
-TEST 2: Click 'Step into'. Debugger should step inside each function.<br>
-TEST 3: 'Step over' to the end of the loop (and 'while' statement) and step over again. Debugger
-should go to the beggining of the loop.<br>
diff --git a/content/browser/debugger/manual_tests/debugger-step-on-for-in-statements.html b/content/browser/debugger/manual_tests/debugger-step-on-for-in-statements.html
deleted file mode 100644
index e360394..0000000
--- a/content/browser/debugger/manual_tests/debugger-step-on-for-in-statements.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<script>
-var myObj = {test : 1};
-function getObject()
-{
-    return myObj;
-}
-
-function statement() {
-    ;
-}
-
-function runForIn()
-{
-    /* place breakpoint on next line and click continue */ debugger;
-    for (var property in getObject())
-        statement();
-}
-
-</script>
-<p>To test, open the DevTools (Ctrl+Shift+I) and reload the page.
-<br><br>
-Before running the tests please perform the following:
-Make sure the execution is not paused in the debugger.<br>
-Click the button and when the debugger breaks, set a breakpoint on the first line in the loop
-(as indicated by the comment), and click continue.<br>
-The debugger should stop at the beggining of the loop.<br>
-The above actions should be performed before <b>each</b> of the following tests.</p>
-<br><br>
-<input type="button" value="run for-in" onclick="runForIn()"/>
-<br><br>
-TEST 1: Click 'continue'. Execution should continue without stopping on the loop breakpoint again.<br>
-TEST 2: Click 'Step over'. Debugger should step inside the loop to the next statement line.<br>
-TEST 3: Click 'Step into'. Debugger should step into 'getObject' function.<br>
-TEST 4: 'Step over' to the statement line and then 'Step over' again. Debugger should pause on
-the for-in loop again.<br>
diff --git a/content/browser/debugger/manual_tests/debugger-step-on-for-statements.html b/content/browser/debugger/manual_tests/debugger-step-on-for-statements.html
deleted file mode 100644
index 75289e5f..0000000
--- a/content/browser/debugger/manual_tests/debugger-step-on-for-statements.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<script src="resources/loop-statements.js"></script>
-<script>        
-function runFor()
-{
-    /* place breakpoint on next line and click continue */ debugger;
-    for (initialize(); condition(); increment())
-        statement();
-}
-</script>
-<p>To test, open the DevTools (Ctrl+Shift+I) and reload the page.
-<br><br>
-Before running the tests please perform the following:
-Make sure the execution is not paused in the debugger.<br>
-Click the button and when the debugger breaks, set a breakpoint on the first line in the loop
-(as indicated by the comment), and click continue.<br>
-The debugger should stop at the beggining of the loop.<br>
-The above actions should be performed before <b>each</b> of the following tests.</p>
-<br><br>
-<input type="button" value="run for" onclick="runFor()"/>
-<br><br>
-TEST 1: Click 'continue'. Execution should continue without stopping on the loop breakpoint again.<br>
-TEST 2: Click 'Step over'. Debugger should step inside the loop to the next statement line.<br>
-TEST 3: Click 'Step into'. Debugger should step into 'initialize' function. Click 'Step into' until
-outside of the 'initialize' function - debugger should enter the 'condition' function.<br>
-function.<br>
diff --git a/content/browser/debugger/manual_tests/debugger-step-on-while-statements.html b/content/browser/debugger/manual_tests/debugger-step-on-while-statements.html
deleted file mode 100644
index 7967172..0000000
--- a/content/browser/debugger/manual_tests/debugger-step-on-while-statements.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<script src="resources/loop-statements.js"></script>
-<script>            
-function runWhile()
-{
-    /* place breakpoint on next line and click continue */ debugger;
-    while (condition()) {
-        statement();
-        increment();
-    }
-}
-
-</script>
-<p>To test, open the DevTools (Ctrl+Shift+I) and reload the page.
-<br><br>
-Before running the tests please perform the following:
-Make sure the execution is not paused in the debugger.<br>
-Click the button and when the debugger breaks, set a breakpoint on the first line in the loop
-(as indicated by the comment), and click continue.<br>
-The debugger should stop at the beggining of the loop.<br>
-The above actions should be performed before <b>each</b> of the following tests.</p>
-<br><br>
-<input type="button" value="run while" onclick="initialize();runWhile()"/>
-<br><br>
-TEST 1: Click 'continue'. Execution should continue without stopping on the loop breakpoint again.<br>
-TEST 2: Click 'Step over'. Debugger should step inside the loop to the next statement line.<br>
-TEST 3: Click 'Step into'. Debugger should step into 'condition' function.<br>
-step over to the beggingin of the while loop again. Click 'Step into'. Debugger should step into
-the 'condition' function.<br>
diff --git a/content/browser/debugger/manual_tests/debugger-watch-expressions.html b/content/browser/debugger/manual_tests/debugger-watch-expressions.html
deleted file mode 100644
index a2e9258..0000000
--- a/content/browser/debugger/manual_tests/debugger-watch-expressions.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<p>Test for watched expression</p>
-
-<p>To begin test, open DevTools, go the Scripts Panel 
-and then click this link: <a href="javascript:runTest()">[begin test]</a>.
-
-<p>Perform the following steps, and note the expected results:
-    
-<ol>
-    
-<li><p>After clicking the link above, you should now be paused in the body of 
-the test method, thanks to the <code>debugger</code> statement.
-
-<li><p>Add the following expressions to the "Watch Expressions" section of the
-Scripts panel sidebar pane: "<code>this</code>", "<code>a</code>", 
-"<code>b</code>", "<code>c</code>" and "<code>d</code>". Do <b>NOT</b> enter the quotes.
-
-<li><p>The values of the expressions as shown in the window should be 
-<code>Object</code> for <code>this</code>, <code>undefined</code> for
-the <code>a</code>, <code>b</code>, and <code>c</code> variables, and a 
-value of <code>ReferenceError: d is not defined</code>
-for the <code>d</code> variable.
-
-<li><p>Note that the value for <code>d</code> should not change for the life of 
-the test, as the variable <code>d</code> is never introduced in the program.
-
-<li><p>Step through the code, and you'll see the values of <code>a</code>,
-<code>b</code>, and <code>c</code> change, as the variables are assigned.
-Also note that as the scope changes due to the function invocation, values
-will be changed to refer to their current scope.  The <code>this</code>
-expression will change when the method is invoked on the object constructed by
-the test.
-
-<li><p>Click different stack frames in the Call Stack section to ensure the
-expressions change value appropriately as the current stack frame changes.
-
-</ol>
-
-<script>
-function runTest() {
-    
-    // a nested function
-    function subFunction() {
-        debugger;
-        var a = "a in subFunction()";
-        
-        subSubFunction();
-        
-        // another nested function
-        function subSubFunction() {
-            debugger;
-            var b = "b in subSubFunction()";
-        }
-    }
-    
-    // a class
-    function aClass() {
-        this.x = "xxx";
-        this.y = "yyy";
-    }
-    
-    aClass.prototype.aMethod = function() {
-        debugger;
-        var c = "c in aMethod()";
-    }
-    
-    // main logic
-    debugger;
-    
-    var a = "a in runTest()";
-    var b = "b in runTest()";
-    var c = "c in runTest()";
-    
-    subFunction();
-    
-    var object = new aClass();
-    object.aMethod();
-    
-}
-</script>
diff --git a/content/browser/debugger/manual_tests/dom-mutation.html b/content/browser/debugger/manual_tests/dom-mutation.html
deleted file mode 100644
index a03b03c..0000000
--- a/content/browser/debugger/manual_tests/dom-mutation.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<script>
-function test1() {
-    document.getElementById("test").src = "resources/mutate-frame.html";
-}
-
-function test2() {
-    document.getElementById("test").src = "resources/mutate-frame-2.html";
-}
-
-var count = 1;
-function run() {
-    var container = document.getElementById("test2");
-    var div = document.createElement("div");
-    div.textContent = "Testing " + (count++);
-    container.appendChild(div);
-    if (count > 10)
-        container.removeChild(container.firstChild);
-}
-
-setInterval(run, 1000);
-</script>
-<p>To begin test, open DevTools, Elements Panel and watch the DOM change to match the page.
-Clicking the buttons will navigate the subframe, and the all the subframe child nodes should change.
-Expand DOM nodes in the Elements Panel to see new nodes appearing in the list live.</p>
-<div style="clear: both">
-<button onclick="test1()">Test Frame 1</button>
-<button onclick="test2()">Test Frame 2</button>
-</div>
-<div style="float: left">
-<iframe id="test" src="resources/mutate-frame.html" width="200" height="300"></iframe>
-</div>
-<div style="float: left; margin-left: 10px;" id="test2"></div>
diff --git a/content/browser/debugger/manual_tests/element-styles.html b/content/browser/debugger/manual_tests/element-styles.html
deleted file mode 100644
index cb33919..0000000
--- a/content/browser/debugger/manual_tests/element-styles.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<style>

-.classTest {

-  -webkit-transform:skew(-10deg,-3deg);

-  color: green;

-  background: #CCC;

-  border: 2px solid blue;

-  padding: 5px 6px 7px 8px;

-}

-</style>

-<p>To begin test, open DevTools, select the Elements panel. Expand the Styles pane in the sidebar.</p>

-<ul>

-  <li>Choose the <b>&lt;div class="classTest"...></b> element in the DOM tree.

-You should see the following element styles in the ".classTest (inline stylesheet)" section:

-<pre>

-  -webkit-transform:skew(-10deg,-3deg);

-  color: green;

-  background: #CCC;

-  border: 2px solid blue;

-  padding: 5px 6px 7px 8px;

-</pre>

-  While changing all the property values, you should see corresponding live page changes.

-  <li>Double click the "-webkit-transform" rule and place the cursor at the second argument (-3deg).

-  <li>Press Up/Down keys do see the argument value change in 1.0 steps (0.1 steps in the [-1; 1] range).

-  <li>Press Shift+Up/Down keys to see the argument value change in 10.0 steps.

-  <li>Press Alt(Cmd)+Up/Downkeys to see the argument value change in 0.1 steps (1.0 steps in the [-1; 1] range).

-  <li>Move the mouse pointer within the section to display checkboxes to the right of the property values.

-  <li>Click the checkboxes to disable/enable the corresponding style properties and observe the page changes.

-You can disable the "-webkit-transform" property if the element overlaps the instructions.

-  <li>Double-click the "background" rule and alter the color to "#FFF". The text background should turn white.

-  <li>Double-click the "color" rule and alter the color to "black". The text background should turn black.

-  <li>Expand the "padding" shorthand property using the arrow at the left. You should see the following

-property values beneath: padding-top: 5px; padding-right: 6px; padding-bottom: 7px; padding-left: 8px;

-  <li>In the "Styles" pane titlebar click the gear button and choose "New Style Rule". In the editbox that appears, type:

-<pre>

-font-family: monospace;

-</pre>

-      The font of the test string should alter to a monospaced one.

-</ul>

-

-<div class="classTest">CLASS_TEST CLASS_TEST CLASS_TEST CLASS_TEST CLASS_TEST CLASS_TEST CLASS_TEST</div>
\ No newline at end of file
diff --git a/content/browser/debugger/manual_tests/error-warning-count.html b/content/browser/debugger/manual_tests/error-warning-count.html
deleted file mode 100644
index 3296742..0000000
--- a/content/browser/debugger/manual_tests/error-warning-count.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<script>
-    function clickHandler(errors, warnings)
-    {
-        return function()
-        {
-            for (var i = 0; i < errors; ++i)
-                console.error("Error " + (i + 1));
-            for (var i = 0; i < warnings; ++i)
-                console.warn("Warning " + (i + 1));
-        }
-    }
-
-    function loaded()
-    {
-        var tests = [
-            { errors: 0, warnings: 0 },
-            { errors: 1, warnings: 0 },
-            { errors: 2, warnings: 0 },
-            { errors: 0, warnings: 1 },
-            { errors: 0, warnings: 2 },
-            { errors: 1, warnings: 1 },
-            { errors: 1, warnings: 2 },
-            { errors: 2, warnings: 1 },
-            { errors: 2, warnings: 2 },
-            { errors: 100, warnings: 100 },
-        ];
-
-        for (var i in tests) {
-            var test = tests[i];
-
-            var button = document.createElement("button");
-            var content = "";
-            if (!test.errors && !test.warnings)
-                content = "(nothing)";
-            else {
-                if (test.errors > 0)
-                    content += test.errors + " error" + (test.errors != 1 ? "s" : "");
-                if (test.warnings > 0) {
-                    if (content.length)
-                        content += ", ";
-                    content += test.warnings + " warning" + (test.warnings != 1 ? "s" : "")
-                }
-            }
-            button.innerText = content;
-            button.onclick = clickHandler(test.errors, test.warnings);
-            var p = document.createElement("p");
-            p.appendChild(button);
-            document.body.appendChild(p);
-        }
-    }
-</script>
-<body onload="loaded()">
-<p>To begin test, open DevTools and click one of the buttons below. You should
-see an error and/or warning count in the Inspector's status bar. Clicking on
-the error/warning count should open the Console. Hovering over the
-error/warning count should show you a tooltip that matches the text in the
-button you clicked.</p>
-<p>Note: You must reload the page between each button press.</p>
diff --git a/content/browser/debugger/manual_tests/event-listeners.html b/content/browser/debugger/manual_tests/event-listeners.html
deleted file mode 100644
index 4dff96d..0000000
--- a/content/browser/debugger/manual_tests/event-listeners.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<head>

-  <script>

-    function attachListener() {

-      document.getElementById("target").addEventListener("click", listenerFunction, true);

-      document.getElementById("targetParent").addEventListener("click", listenerFunctionParent, true);

-    }

-    function listenerFunctionParent(event) {

-      event.target.textContent = "event handled";

-    }

-    function listenerFunction(event) {

-      event.target.textContent = "event handled";

-    }

-  </script>

-</head>

-<body onload="attachListener()">

-<div id="targetParent">

-  <div id="target"></div>

-</div>

-<p>To begin test, open DevTools, select the Elements panel. Expand the Event Listeners

-pane in the sidebar.

-<ul>

-  <li>Choose the <b>&lt;div id="targetParent"...></b> element.

-You should see the "click" section in the Event Listeners pane. Expand the section to see

-the "listenerFunctionParent" function (at "div#targetParent") under it.

-  <li>Expand the targetParent node in the tree and choose the <b>&lt;div id="target"...></b>

-element. You should see the "click" section in the Event Listeners pane. Expand the section

-to see two functions, "listenerFunctionParent" (at "div#targetParent") and

-"listenerFunction" (at "div#target") under it.

-</ul>

-</body>

diff --git a/content/browser/debugger/manual_tests/heap-profiler-test-basic-grid-functionality.html b/content/browser/debugger/manual_tests/heap-profiler-test-basic-grid-functionality.html
deleted file mode 100644
index 5aa4555..0000000
--- a/content/browser/debugger/manual_tests/heap-profiler-test-basic-grid-functionality.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <title>Heap Profiler: basic grid functionality test</title>
-  </head>
-  <body>
-    This is the test for basic functionality of heap snapshot view grid.
-    <br>
-    <br>
-    To use this test:
-    <ul>
-      <li>load file in the browser;
-      <li>open DevTools (Ctrl+Shift+I on Win/Linux, Command+Option+I on Mac);
-      <li>go to 'Profiles' page;
-      <li>press 'Take heap snapshot' button
-        (eye icon on the left side of status bar);
-    </ul>
-    <br>
-    On the left pane under 'Heap snapshots' section, an item called
-    'Snapshot 1' must appear, and a grid with snapshot data must
-    appear on the right. Now test the following functionality in the grid:
-    <ul>
-      <li>change sorting order in each column by clicking on its header;
-      <li>resize each column;
-      <li>toggle between showing absolute times and percents
-        (button with percent sign on the status bar);
-      <li>double-click on numbers in 'Count' and
-        'Size' columns to toggle between times and percents for
-        this column only;
-      <li>expanding and collapsing tree nodes.
-    </ul>
-  </body>
-</html>
diff --git a/content/browser/debugger/manual_tests/heap-profiler-test-snapshots-comparison.html b/content/browser/debugger/manual_tests/heap-profiler-test-snapshots-comparison.html
deleted file mode 100644
index 3a419d4e..0000000
--- a/content/browser/debugger/manual_tests/heap-profiler-test-snapshots-comparison.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<html>
-  <head>
-    <title>Heap Profiler: heap snapshots comparison test</title>
-    <script type="text/javascript">
-      var aHolder = [], bHolder = [], cHolder = [], dHolder = [];
-
-      function A(x) {
-        this.x = x;
-      }
-
-      function B(x) {
-        this.x = x;
-      }
-
-      function C() {}
-
-      var i;
-      for (i = 0; i < 100; ++i) {
-        var b = new B('hello');
-        bHolder.push(b);
-        aHolder.push(new A(b));
-        b = null;
-      }
-      for (i = 0; i < 25; ++i) {
-        cHolder.push(new C());
-      }
-
-      function D() {}
-
-      function changeStuff() {
-        if (aHolder.length > 0) {
-          aHolder.splice(aHolder.length - 25, 25);
-        }
-        for (i = 0; i < 25; ++i) {
-          bHolder.push(new B('hello'));
-        }
-        cHolder = [];
-        for (i = 0; i < 25; ++i) {
-          dHolder.push(new D());
-        }
-      }
-    </script>
-  </head>
-  <body>
-    This is the test for heap snapshot comparison functionality.
-    <br>
-    <br>
-    To use this test:
-    <ul>
-      <li>load file in the browser;
-      <li>open DevTools (Ctrl+Shift+I on Win/Linux, Command+Option+I on Mac);
-      <li>go to 'Profiles' page;
-      <li>press 'Take heap snapshot' button
-        (eye icon on the left side of the status bar);
-      <li>press
-        <input type="button" name="changeStuff" value="this button" onclick="changeStuff()" />;
-      <li>press 'Take heap snapshot' button again;
-    </ul>
-    <br>
-    On the left pane under 'Heap snapshots' section, items called
-    'Snapshot 1' and 'Snapshot 2' must appear. Select 'Snapshot 2'. 
-    Ensure that absolute values are shown (not percents).
-    <br>
-    <br>
-    TEST 1. Verify the following:
-    <ul>
-      <li>the value in '+/- Count' column for 'A' must be '-25';
-      <li>after expanding 'A' item, the value in '+/- Count' column
-        for 'Array' child entry must also be '-25';
-      <li>the value in '+/- Count' column for 'B' must be '+25';
-      <li>after expanding 'B' item, the value in '+/- Count' column
-        for 'Array' child entry must also be '+25'; the value for 'A'
-        child must be '-25';
-    </ul>
-    <br>
-    TEST 2. Change display to percent view (using the percent button on the
-    status bar). Verify the following:
-    <ul>
-      <li>values in '+/- Count' and '+/- Size' columns for 'C' must be 'deleted';
-      <li>values in '+/- Count' and '+/- Size' columns for 'D' must be 'new';
-    </ul>
-  </body>
-</html>
diff --git a/content/browser/debugger/manual_tests/highlight-nodes.html b/content/browser/debugger/manual_tests/highlight-nodes.html
deleted file mode 100644
index cbeae6f..0000000
--- a/content/browser/debugger/manual_tests/highlight-nodes.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<style>
-.skewed {
-  -webkit-transform:skew(-5deg,-5deg);
-}
-</style>
-<p>This page has basic tests of node highlighting in the inspected page. To test, load this page, open the DevTools and mouseover the nodes in the treeview of the inspector. You should see the highlights happen with the appropriate padding/border/margin/content highlights.</p>
-<div style="padding:10px; border: 10px solid; margin: 10px;">padding:10px; border: 10px; margin: 10px;</div>
-<div style="padding:10px; border: 10px solid;">padding:10px; border: 10px;</div>
-<div style="padding:10px; margin: 10px;">padding:10px; margin: 10px;</div>
-<div style="border: 10px solid; margin: 10px;">border: 10px; margin: 10px;</div>
-<div style="padding:10px">padding:10px;</div>
-<div style="border: 10px solid;">border: 10px;</div>
-<div style="margin: 10px;">margin: 10px;</div>
-<div>no padding, border, or margin</div>
-<div class=skewed style="padding:10px; border: 10px solid; margin: 10px;">-webkit-transform:skew(-5deg,-5deg); padding:10px; border: 10px; margin: 10px;</div>
-<div class=skewed style="padding:10px; border: 10px solid;">-webkit-transform:skew(-5deg,-5deg); padding:10px; border: 10px;</div>
-<div class=skewed style="padding:10px; margin: 10px;">-webkit-transform:skew(-5deg,-5deg); padding:10px; margin: 10px;</div>
-<div class=skewed style="border: 10px solid; margin: 10px;">-webkit-transform:skew(-5deg,-5deg); border: 10px; margin: 10px;</div>
-<div class=skewed style="padding:10px">-webkit-transform:skew(-5deg,-5deg); padding:10px;</div>
-<div class=skewed style="border: 10px solid;">-webkit-transform:skew(-5deg,-5deg); border: 10px;</div>
-<div class=skewed style="margin: 10px;">-webkit-transform:skew(-5deg,-5deg); margin: 10px;</div>
-<div class=skewed >-webkit-transform:skew(-5deg,-5deg); no padding, border, or margin</div>
-
diff --git a/content/browser/debugger/manual_tests/highlight-source-line.html b/content/browser/debugger/manual_tests/highlight-source-line.html
deleted file mode 100644
index a56ed97..0000000
--- a/content/browser/debugger/manual_tests/highlight-source-line.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>To test, open the DevTools and reload this page. Then open the Console and click the link for the markup error. You should see the line containing the error briefly highlighted in the source view.</p>
-
-<p>This line contains a markup error</i>.</p>
diff --git a/content/browser/debugger/manual_tests/profiler-test-basic-grid-functionality.html b/content/browser/debugger/manual_tests/profiler-test-basic-grid-functionality.html
deleted file mode 100644
index 1841715..0000000
--- a/content/browser/debugger/manual_tests/profiler-test-basic-grid-functionality.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<html>
-  <head>
-    <title>Profiler: basic grid functionality test</title>
-    <script type="text/javascript" src="resources/fib.js"></script>
-  </head>
-  <body onload="run_fib()">
-    This test runs a simple looped computation to test basic
-    functionality of profile view grid.
-    <br>
-    <br>
-    To use this test:
-    <ul>
-      <li>load file in the browser;
-      <li>open DevTools (Ctrl+Shift+I on Win/Linux, Command+Option+I on Mac);
-      <li>go to 'Profiles' page;
-      <li>press 'Start profiling' button
-        (gray dot on the left side of status bar);
-      <li>wait for 5 seconds;
-      <li>press 'Stop profiling' button
-        (red dot on the left side of status bar);
-    </ul>
-    <br>
-    On the left pane under 'CPU profiles' section, an item called
-    'Profile 1' must appear, and a grid with profile data must
-    appear on the right. Now test the following functionality in the grid:
-    <ul>
-      <li>change sorting order in each column by clicking on its header;
-      <li>resize each column;
-      <li>toggle between showing absolute times and percents
-        (button with percent sign on the status bar);
-      <li>double-click on numbers in 'Self' and
-        'Total' columns to toggle between times and percents for
-        this column only;
-      <li>expanding and collapsing tree nodes;
-      <li>toggling between "Heavy" and "Tree" views.
-    </ul>
-  </body>
-</html>
diff --git a/content/browser/debugger/manual_tests/profiler-test-console-control.html b/content/browser/debugger/manual_tests/profiler-test-console-control.html
deleted file mode 100644
index 4f2001a..0000000
--- a/content/browser/debugger/manual_tests/profiler-test-console-control.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-  <head>
-    <title>Profiler: test console controlling of CPU profiling</title>
-    <script type="text/javascript" src="resources/fib.js"></script>
-    <script type="text/javascript">
-      function profile_fib() {
-        console.profile();
-        run_fib();
-        window.setTimeout('console.profileEnd();', 5000);
-      }
-    </script>
-  </head>
-  <body onload="profile_fib()">
-    This test runs and profiles a simple looped computation.
-    <br>
-    <br>
-    TEST
-    <ul>
-      <li>load file in the browser;
-      <li>open DevTools with console (Ctrl+Shift+I on Win/Linux, Command+Option+I on Mac);
-      <li>go to 'Profiles' page;
-      <li>observe that 'Profile 1' item has appeared under 'CPU profiles' section;
-      <li>check for presence of 'eternal_fib' entry in the profile view.
-    </ul>
-    <br>
-  </body>
-</html>
diff --git a/content/browser/debugger/manual_tests/profiler-test-focus-and-exclude.html b/content/browser/debugger/manual_tests/profiler-test-focus-and-exclude.html
deleted file mode 100644
index d33e3eb..0000000
--- a/content/browser/debugger/manual_tests/profiler-test-focus-and-exclude.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<html>
-  <head>
-    <title>Profiler: focusing and exclusion test</title>
-    <script type="text/javascript" src="resources/fib.js"></script>
-  </head>
-  <body onload="run_fib()">
-    This test runs a simple looped computation to test focusing and
-    exclusion functionality of profile view grid.
-    <br>
-    <br>
-    To use this test:
-    <ul>
-      <li>load file in the browser;
-      <li>open DevTools (Ctrl+Shift+I on Win/Linux, Command+Option+I on Mac);
-      <li>go to 'Profiles' page;
-      <li>press 'Start profiling' button
-        (gray dot on the left side of status bar);
-      <li>wait for 5 seconds;
-      <li>press 'Stop profiling' button
-        (red dot on the left side of status bar);
-    </ul>
-    <br>
-    On the left pane under 'CPU profiles' section, an item called
-    'Profile 1' must appear, and a grid with profile data must
-    appear on the right. Now test the following functionality in the grid:
-    <br>
-    TEST 1:
-    <ul>
-      <li>select 'eternal_fib' function entry (without expanding it),
-        press 'Focus
-        on selected function' button (eye on the right of the status bar);
-      <li>ensure that only 'eternal_fib' function and its children are 
-        left in the tree, and 'Total' column for the function shows
-        '100%' value;
-      <li>expand 'eternal_fib' function node;
-      <li>press 'Restore all functions' button;
-      <li>verify that the value in 'Total' column is less than 100%;
-      <li>verify that 'eternal_fib' function node is can still be
-        collapsed and expanded back;
-    </ul>
-    <br>
-    TEST 2:
-    <ul>
-      <li>expand two levels of 'Script:' node, select the second-level
-        node;
-      <li>repeat the same steps for the selected node (in this case, immediate
-        parent nodes of the focused node must also remain visible after
-        focusing);
-    </ul>
-    <br>
-    TEST 3:
-    <ul>
-      <li>by expanding 'Script:' node, make sure that at least 3
-        'eternal_fib' function nodes are visible;
-      <li>select any of 'eternal_fib' nodes and press
-        'Exclude selected function' (cross) button on the status bar;
-      <li>verify that all 'eternal_fib' nodes are no more visible;
-      <li>expand more 'Script:' node levels, verify that no new
-        'eternal_fib' nodes appear with expansion;
-      <li>press 'Restore all functions' button;
-      <li>verify that 'eternal_fib' nodes are now visible;
-    </ul>
-    <br>
-    TESTS 4 and 5:
-    <br>
-    Now switch to 'Tree (Top Down)' view and repeat testing steps.
-    For the 'Exclude selected function' function test, use 
-    'Script:' function node, as 'eternal_fib' has only
-    one entry in this view.
-  </body>
-</html>
diff --git a/content/browser/debugger/manual_tests/profiler-test-re-opening.html b/content/browser/debugger/manual_tests/profiler-test-re-opening.html
deleted file mode 100644
index a615afa..0000000
--- a/content/browser/debugger/manual_tests/profiler-test-re-opening.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<html>
-  <head>
-    <title>Profiler: test profiles population on DevTools re-opening</title>
-    <script type="text/javascript" src="resources/fib.js"></script>
-    <script type="text/javascript">
-      function profile_fib() {
-        console.profile();
-        run_fib();
-        window.setTimeout('console.profileEnd();', 5000);
-      }
-    </script>
-  </head>
-  <body onload="profile_fib()">
-    This test runs and profiles a simple looped computation.
-    <br>
-    <br>
-    TEST
-    <ul>
-      <li>load file in the browser;
-      <li>open DevTools with console (Ctrl+Shift+I on Win/Linux, Command+Option+I on Mac);
-      <li>go to 'Profiles' page;
-      <li>observe that 'Profile 1' item has appeared under 'CPU profiles' section;
-      <li>reload page in browser;
-      <li>observe that after 5 seconds, 'Profile 2' item has appeared under
-        'CPU profiles' section;
-      <li>take a couple of heap snapshots by pressing 'Take heap snapshot.'
-        button (eye icon on the left of the status bar);
-      <li>close DevTools window;
-      <li>re-open DevTools window;
-      <li>go to 'Profiles' page;
-      <li>verify that CPU profiles 'Profile 1' and 'Profile 2', and heap profiles
-        taken previously are restored back (<b>Warning:</b> it may take some
-        time to re-process them).
-    </ul>
-    <br>
-  </body>
-</html>
diff --git a/content/browser/debugger/manual_tests/resources/fib.js b/content/browser/debugger/manual_tests/resources/fib.js
deleted file mode 100644
index 804c866..0000000
--- a/content/browser/debugger/manual_tests/resources/fib.js
+++ /dev/null
@@ -1,20 +0,0 @@
-function fib(n) {
-  return n < 2 ? 1 : fib(n - 1) + fib(n - 2);
-}
-
-function eternal_fib() {
-  var started = Date.now();
-  while(true) {
-    fib(20);
-    // Make page responsive by making a break every 100 ms.
-    if (Date.now() - started >= 100) {
-      setTimeout(eternal_fib, 0);
-      return;
-    }
-  }
-}
-
-function run_fib() {
-  // Let the page do initial rendering, then go.
-  setTimeout(eternal_fib, 200);
-}
diff --git a/content/browser/debugger/manual_tests/resources/loop-statements.js b/content/browser/debugger/manual_tests/resources/loop-statements.js
deleted file mode 100644
index cbb4e0d..0000000
--- a/content/browser/debugger/manual_tests/resources/loop-statements.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var i;
-var a;
-
-function initialize()
-{
-    i = false;
-}
-
-function condition()
-{
-    return !i;
-}
-
-function increment()
-{
-    i = !i;
-}
-
-function statement()
-{
-    a = i;
-}
diff --git a/content/browser/debugger/manual_tests/resources/mutate-frame-2.html b/content/browser/debugger/manual_tests/resources/mutate-frame-2.html
deleted file mode 100644
index 9d413b9..0000000
--- a/content/browser/debugger/manual_tests/resources/mutate-frame-2.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<script>
-var count = 1;
-function run() {
-    var div = document.createElement("div");
-    div.textContent = "Testing " + (count++);
-    document.body.appendChild(div);
-    if (count > 10)
-        document.body.removeChild(document.body.firstChild);
-}
-
-setInterval(run, 1000);
-</script>
diff --git a/content/browser/debugger/manual_tests/resources/mutate-frame.html b/content/browser/debugger/manual_tests/resources/mutate-frame.html
deleted file mode 100644
index 08fc656..0000000
--- a/content/browser/debugger/manual_tests/resources/mutate-frame.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<script>
-var count = 1;
-function run() {
-    var div = document.createElement("div");
-    div.textContent = "Testing " + (count++);
-    document.body.appendChild(div);
-}
-
-setInterval(run, 1000);
-</script>
diff --git a/content/browser/debugger/manual_tests/resources/primes.js b/content/browser/debugger/manual_tests/resources/primes.js
deleted file mode 100644
index 64d38dc..0000000
--- a/content/browser/debugger/manual_tests/resources/primes.js
+++ /dev/null
@@ -1,13 +0,0 @@
-function Primes() {
-  this.primes_ = {};
-}
-
-Primes.prototype.test = function(p) {
-  for (var divisor in this.primes_) {
-    if (p % divisor === 0) return false;
-    if (divisor * divisor > p)
-      break;
-  }
-  this.primes_[p] = 1;
-  return true;
-}
diff --git a/content/browser/debugger/manual_tests/resources/script-console-calls.js b/content/browser/debugger/manual_tests/resources/script-console-calls.js
deleted file mode 100644
index 9c7bc35..0000000
--- a/content/browser/debugger/manual_tests/resources/script-console-calls.js
+++ /dev/null
@@ -1,8 +0,0 @@
-console.info("Test console.info");
-console.log("Test console.log");
-console.warn("Test console.warn");
-console.error("Test console.error");
-console.time("Test console.time");
-console.timeEnd("Test console.time");
-console.count("Test console.count");
-console.assert(false, "Test console.assert");
diff --git a/content/browser/debugger/manual_tests/resources/worker-primes.js b/content/browser/debugger/manual_tests/resources/worker-primes.js
deleted file mode 100644
index 8be021f..0000000
--- a/content/browser/debugger/manual_tests/resources/worker-primes.js
+++ /dev/null
@@ -1,10 +0,0 @@
-importScripts('primes.js');
-
-var primes = new Primes();
-
-onmessage = function(event) {
-  var p = event.data;
-  if (p != parseInt(p))
-    throw 'invalid argument';
-  postMessage([p, primes.test(p)]);
-}
diff --git a/content/browser/debugger/DEPS b/content/browser/devtools/DEPS
index 3e98aee..3e98aee 100644
--- a/content/browser/debugger/DEPS
+++ b/content/browser/devtools/DEPS
diff --git a/chrome/browser/debugger/OWNERS b/content/browser/devtools/OWNERS
index 3f23035..bb6028e 100644
--- a/chrome/browser/debugger/OWNERS
+++ b/content/browser/devtools/OWNERS
@@ -1,3 +1,2 @@
-apavlov@chromium.org
 pfeldman@chromium.org
 yurys@chromium.org
diff --git a/content/browser/debugger/devtools_agent_host.cc b/content/browser/devtools/devtools_agent_host.cc
index 6ea8f5d..fa5bc0e 100644
--- a/content/browser/debugger/devtools_agent_host.cc
+++ b/content/browser/devtools/devtools_agent_host.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_agent_host.h"
+#include "content/browser/devtools/devtools_agent_host.h"
 
 #include "base/basictypes.h"
 #include "content/common/devtools_messages.h"
diff --git a/content/browser/debugger/devtools_agent_host.h b/content/browser/devtools/devtools_agent_host.h
index 944315b..ae44862 100644
--- a/content/browser/debugger/devtools_agent_host.h
+++ b/content/browser/devtools/devtools_agent_host.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_AGENT_HOST_H_
-#define CONTENT_BROWSER_DEBUGGER_DEVTOOLS_AGENT_HOST_H_
+#ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_AGENT_HOST_H_
+#define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_AGENT_HOST_H_
 
 #include <string>
 
@@ -56,4 +56,4 @@ class CONTENT_EXPORT DevToolsAgentHost {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_DEBUGGER_DEVTOOLS_AGENT_HOST_H_
+#endif  // CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_AGENT_HOST_H_
diff --git a/content/browser/debugger/devtools_browser_target.cc b/content/browser/devtools/devtools_browser_target.cc
index 95d57a9..44291b4 100644
--- a/content/browser/debugger/devtools_browser_target.cc
+++ b/content/browser/devtools/devtools_browser_target.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_browser_target.h"
+#include "content/browser/devtools/devtools_browser_target.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
diff --git a/content/browser/debugger/devtools_browser_target.h b/content/browser/devtools/devtools_browser_target.h
index 14e141f..a0a34e3 100644
--- a/content/browser/debugger/devtools_browser_target.h
+++ b/content/browser/devtools/devtools_browser_target.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_BROWSER_TARGET_H_
-#define CONTENT_BROWSER_DEBUGGER_DEVTOOLS_BROWSER_TARGET_H_
+#ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_BROWSER_TARGET_H_
+#define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_BROWSER_TARGET_H_
 
 #include <map>
 #include <string>
@@ -65,4 +65,4 @@ class DevToolsBrowserTarget {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_DEBUGGER_DEVTOOLS_BROWSER_TARGET_H_
+#endif  // CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_BROWSER_TARGET_H_
diff --git a/content/browser/debugger/devtools_frontend_host.cc b/content/browser/devtools/devtools_frontend_host.cc
index 49bac66..fe7e82d 100644
--- a/content/browser/debugger/devtools_frontend_host.cc
+++ b/content/browser/devtools/devtools_frontend_host.cc
@@ -2,9 +2,9 @@
 // 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_frontend_host.h"
+#include "content/browser/devtools/devtools_frontend_host.h"
 
-#include "content/browser/debugger/devtools_manager_impl.h"
+#include "content/browser/devtools/devtools_manager_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/devtools_messages.h"
diff --git a/content/browser/debugger/devtools_frontend_host.h b/content/browser/devtools/devtools_frontend_host.h
index fd04fd1..6168692 100644
--- a/content/browser/debugger/devtools_frontend_host.h
+++ b/content/browser/devtools/devtools_frontend_host.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_FRONTEND_HOST_H_
-#define CONTENT_BROWSER_DEBUGGER_DEVTOOLS_FRONTEND_HOST_H_
+#ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_FRONTEND_HOST_H_
+#define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_FRONTEND_HOST_H_
 
 #include <string>
 
@@ -56,4 +56,4 @@ class DevToolsFrontendHost : public DevToolsClientHost,
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_DEBUGGER_DEVTOOLS_FRONTEND_HOST_H_
+#endif  // CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_FRONTEND_HOST_H_
diff --git a/content/browser/debugger/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc
index a62d4bd..6d214ab 100644
--- a/content/browser/debugger/devtools_http_handler_impl.cc
+++ b/content/browser/devtools/devtools_http_handler_impl.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_http_handler_impl.h"
+#include "content/browser/devtools/devtools_http_handler_impl.h"
 
 #include <algorithm>
 #include <utility>
@@ -19,8 +19,8 @@
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "content/browser/debugger/devtools_browser_target.h"
-#include "content/browser/debugger/devtools_tracing_handler.h"
+#include "content/browser/devtools/devtools_browser_target.h"
+#include "content/browser/devtools/devtools_tracing_handler.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/devtools_messages.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/debugger/devtools_http_handler_impl.h b/content/browser/devtools/devtools_http_handler_impl.h
index ef36be8..9ee6f92 100644
--- a/content/browser/debugger/devtools_http_handler_impl.h
+++ b/content/browser/devtools/devtools_http_handler_impl.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_HTTP_HANDLER_IMPL_H_
-#define CONTENT_BROWSER_DEBUGGER_DEVTOOLS_HTTP_HANDLER_IMPL_H_
+#ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_HTTP_HANDLER_IMPL_H_
+#define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_HTTP_HANDLER_IMPL_H_
 
 #include <map>
 #include <set>
@@ -140,4 +140,4 @@ class DevToolsHttpHandlerImpl
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_DEBUGGER_DEVTOOLS_HTTP_HANDLER_IMPL_H_
+#endif  // CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_HTTP_HANDLER_IMPL_H_
diff --git a/content/browser/debugger/devtools_http_handler_unittest.cc b/content/browser/devtools/devtools_http_handler_unittest.cc
index b01c9d9..b01c9d9 100644
--- a/content/browser/debugger/devtools_http_handler_unittest.cc
+++ b/content/browser/devtools/devtools_http_handler_unittest.cc
diff --git a/content/browser/debugger/devtools_manager_impl.cc b/content/browser/devtools/devtools_manager_impl.cc
index 92158e2..b548ba2 100644
--- a/content/browser/debugger/devtools_manager_impl.cc
+++ b/content/browser/devtools/devtools_manager_impl.cc
@@ -2,20 +2,20 @@
 // 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_manager_impl.h"
+#include "content/browser/devtools/devtools_manager_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "content/browser/child_process_security_policy_impl.h"
-#include "content/browser/debugger/devtools_netlog_observer.h"
-#include "content/browser/debugger/render_view_devtools_agent_host.h"
+#include "content/browser/devtools/devtools_netlog_observer.h"
+#include "content/browser/devtools/render_view_devtools_agent_host.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/devtools_client_host.h"
 #include "content/public/browser/devtools_agent_host_registry.h"
+#include "content/public/browser/devtools_client_host.h"
 #include "googleurl/src/gurl.h"
 
 namespace content {
diff --git a/content/browser/debugger/devtools_manager_impl.h b/content/browser/devtools/devtools_manager_impl.h
index 2df870e..ed213b7 100644
--- a/content/browser/debugger/devtools_manager_impl.h
+++ b/content/browser/devtools/devtools_manager_impl.h
@@ -2,15 +2,15 @@
 // 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_MANAGER_IMPL_H_
-#define CONTENT_BROWSER_DEBUGGER_DEVTOOLS_MANAGER_IMPL_H_
+#ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_MANAGER_IMPL_H_
+#define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_MANAGER_IMPL_H_
 
 #include <map>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/singleton.h"
-#include "content/browser/debugger/devtools_agent_host.h"
+#include "content/browser/devtools/devtools_agent_host.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/devtools_client_host.h"
 #include "content/public/browser/devtools_manager.h"
@@ -128,4 +128,4 @@ class CONTENT_EXPORT DevToolsManagerImpl
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_DEBUGGER_DEVTOOLS_MANAGER_IMPL_H_
+#endif  // CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_MANAGER_IMPL_H_
diff --git a/content/browser/debugger/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc
index 7b6bc6d..d2a47a5 100644
--- a/content/browser/debugger/devtools_manager_unittest.cc
+++ b/content/browser/devtools/devtools_manager_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "base/basictypes.h"
 #include "base/time.h"
-#include "content/browser/debugger/devtools_manager_impl.h"
-#include "content/browser/debugger/render_view_devtools_agent_host.h"
+#include "content/browser/devtools/devtools_manager_impl.h"
+#include "content/browser/devtools/render_view_devtools_agent_host.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/web_contents/test_web_contents.h"
 #include "content/common/view_messages.h"
diff --git a/content/browser/debugger/devtools_netlog_observer.cc b/content/browser/devtools/devtools_netlog_observer.cc
index fc02443..f65bc42 100644
--- a/content/browser/debugger/devtools_netlog_observer.cc
+++ b/content/browser/devtools/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 "content/browser/debugger/devtools_netlog_observer.h"
+#include "content/browser/devtools/devtools_netlog_observer.h"
 
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
diff --git a/content/browser/debugger/devtools_netlog_observer.h b/content/browser/devtools/devtools_netlog_observer.h
index 3306bc2..4e74edd 100644
--- a/content/browser/debugger/devtools_netlog_observer.h
+++ b/content/browser/devtools/devtools_netlog_observer.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_NETLOG_OBSERVER_H_
-#define CONTENT_BROWSER_DEBUGGER_DEVTOOLS_NETLOG_OBSERVER_H_
+#ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_NETLOG_OBSERVER_H_
+#define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_NETLOG_OBSERVER_H_
 
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
@@ -67,4 +67,4 @@ class DevToolsNetLogObserver : public net::NetLog::ThreadSafeObserver {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_DEBUGGER_DEVTOOLS_NETLOG_OBSERVER_H_
+#endif  // CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_NETLOG_OBSERVER_H_
diff --git a/content/browser/debugger/devtools_resources.gyp b/content/browser/devtools/devtools_resources.gyp
index 9ee2076..9ee2076 100644
--- a/content/browser/debugger/devtools_resources.gyp
+++ b/content/browser/devtools/devtools_resources.gyp
diff --git a/content/browser/debugger/devtools_tracing_handler.cc b/content/browser/devtools/devtools_tracing_handler.cc
index f1eb740..5514452 100644
--- a/content/browser/debugger/devtools_tracing_handler.cc
+++ b/content/browser/devtools/devtools_tracing_handler.cc
@@ -2,13 +2,13 @@
 // 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_tracing_handler.h"
+#include "content/browser/devtools/devtools_tracing_handler.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/values.h"
-#include "content/browser/debugger/devtools_http_handler_impl.h"
+#include "content/browser/devtools/devtools_http_handler_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/trace_controller.h"
 #include "content/public/browser/trace_subscriber.h"
diff --git a/content/browser/debugger/devtools_tracing_handler.h b/content/browser/devtools/devtools_tracing_handler.h
index a5858fc..c01896a 100644
--- a/content/browser/debugger/devtools_tracing_handler.h
+++ b/content/browser/devtools/devtools_tracing_handler.h
@@ -2,10 +2,10 @@
 // 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_TRACING_HANDLER_H_
-#define CONTENT_BROWSER_DEBUGGER_DEVTOOLS_TRACING_HANDLER_H_
+#ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_TRACING_HANDLER_H_
+#define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_TRACING_HANDLER_H_
 
-#include "content/browser/debugger/devtools_browser_target.h"
+#include "content/browser/devtools/devtools_browser_target.h"
 #include "content/public/browser/trace_subscriber.h"
 
 namespace content {
@@ -47,4 +47,4 @@ class DevToolsTracingHandler
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_DEBUGGER_DEVTOOLS_TRACING_HANDLER_H_
+#endif  // CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_TRACING_HANDLER_H_
diff --git a/content/browser/debugger/render_view_devtools_agent_host.cc b/content/browser/devtools/render_view_devtools_agent_host.cc
index 716ffa3..4de7545 100644
--- a/content/browser/debugger/render_view_devtools_agent_host.cc
+++ b/content/browser/devtools/render_view_devtools_agent_host.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/debugger/render_view_devtools_agent_host.h"
+#include "content/browser/devtools/render_view_devtools_agent_host.h"
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
-#include "content/browser/debugger/devtools_manager_impl.h"
-#include "content/browser/debugger/render_view_devtools_agent_host.h"
+#include "content/browser/devtools/devtools_manager_impl.h"
+#include "content/browser/devtools/render_view_devtools_agent_host.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/site_instance_impl.h"
diff --git a/content/browser/debugger/render_view_devtools_agent_host.h b/content/browser/devtools/render_view_devtools_agent_host.h
index 4235467..afd3173 100644
--- a/content/browser/debugger/render_view_devtools_agent_host.h
+++ b/content/browser/devtools/render_view_devtools_agent_host.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_DEBUGGER_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_
-#define CONTENT_BROWSER_DEBUGGER_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_
+#ifndef CONTENT_BROWSER_DEVTOOLS_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_
+#define CONTENT_BROWSER_DEVTOOLS_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "content/browser/debugger/devtools_agent_host.h"
+#include "content/browser/devtools/devtools_agent_host.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/render_view_host_observer.h"
 
@@ -48,4 +48,4 @@ class CONTENT_EXPORT RenderViewDevToolsAgentHost
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_DEBUGGER_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_
+#endif  // CONTENT_BROWSER_DEVTOOLS_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_
diff --git a/content/browser/debugger/worker_devtools_manager.cc b/content/browser/devtools/worker_devtools_manager.cc
index 3dda612..f341c82 100644
--- a/content/browser/debugger/worker_devtools_manager.cc
+++ b/content/browser/devtools/worker_devtools_manager.cc
@@ -2,23 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/debugger/worker_devtools_manager.h"
+#include "content/browser/devtools/worker_devtools_manager.h"
 
 #include <list>
 #include <map>
 
 #include "base/bind.h"
-#include "content/browser/debugger/devtools_agent_host.h"
-#include "content/browser/debugger/devtools_manager_impl.h"
-#include "content/browser/debugger/worker_devtools_message_filter.h"
+#include "content/browser/devtools/devtools_agent_host.h"
+#include "content/browser/devtools/devtools_manager_impl.h"
+#include "content/browser/devtools/worker_devtools_message_filter.h"
 #include "content/browser/worker_host/worker_service_impl.h"
 #include "content/common/devtools_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/devtools_agent_host_registry.h"
 #include "content/public/common/process_type.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 
 namespace content {
diff --git a/content/browser/debugger/worker_devtools_manager.h b/content/browser/devtools/worker_devtools_manager.h
index e416727..13ef33b 100644
--- a/content/browser/debugger/worker_devtools_manager.h
+++ b/content/browser/devtools/worker_devtools_manager.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_WORKER_DEVTOOLS_MANAGER_H_
-#define CONTENT_BROWSER_DEBUGGER_WORKER_DEVTOOLS_MANAGER_H_
+#ifndef CONTENT_BROWSER_DEVTOOLS_WORKER_DEVTOOLS_MANAGER_H_
+#define CONTENT_BROWSER_DEVTOOLS_WORKER_DEVTOOLS_MANAGER_H_
 
 #include <list>
 #include <map>
@@ -11,8 +11,8 @@
 
 #include "base/basictypes.h"
 #include "base/memory/singleton.h"
-#include "content/common/content_export.h"
 #include "content/browser/worker_host/worker_process_host.h"
+#include "content/common/content_export.h"
 
 namespace content {
 
@@ -106,4 +106,4 @@ class WorkerDevToolsManager {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_DEBUGGER_WORKER_DEVTOOLS_MANAGER_H_
+#endif  // CONTENT_BROWSER_DEVTOOLS_WORKER_DEVTOOLS_MANAGER_H_
diff --git a/content/browser/debugger/worker_devtools_message_filter.cc b/content/browser/devtools/worker_devtools_message_filter.cc
index 5a1fba5..3f5553f1 100644
--- a/content/browser/debugger/worker_devtools_message_filter.cc
+++ b/content/browser/devtools/worker_devtools_message_filter.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/debugger/worker_devtools_message_filter.h"
+#include "content/browser/devtools/worker_devtools_message_filter.h"
 
-#include "content/browser/debugger/worker_devtools_manager.h"
+#include "content/browser/devtools/worker_devtools_manager.h"
 #include "content/common/devtools_messages.h"
 #include "content/common/worker_messages.h"
 
diff --git a/content/browser/debugger/worker_devtools_message_filter.h b/content/browser/devtools/worker_devtools_message_filter.h
index e50dfa8..73ba6f84 100644
--- a/content/browser/debugger/worker_devtools_message_filter.h
+++ b/content/browser/devtools/worker_devtools_message_filter.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_WORKER_DEVTOOLS_MESSAGE_FILTER_H_
-#define CONTENT_BROWSER_DEBUGGER_WORKER_DEVTOOLS_MESSAGE_FILTER_H_
+#ifndef CONTENT_BROWSER_DEVTOOLS_WORKER_DEVTOOLS_MESSAGE_FILTER_H_
+#define CONTENT_BROWSER_DEVTOOLS_WORKER_DEVTOOLS_MESSAGE_FILTER_H_
 
 #include "base/callback_forward.h"
 #include "content/public/browser/browser_message_filter.h"
@@ -32,4 +32,4 @@ class WorkerDevToolsMessageFilter : public BrowserMessageFilter {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_DEBUGGER_WORKER_DEVTOOLS_MESSAGE_FILTER_H_
+#endif  // CONTENT_BROWSER_DEVTOOLS_WORKER_DEVTOOLS_MESSAGE_FILTER_H_
diff --git a/content/browser/loader/async_resource_handler.cc b/content/browser/loader/async_resource_handler.cc
index c47e46f..eee07f3 100644
--- a/content/browser/loader/async_resource_handler.cc
+++ b/content/browser/loader/async_resource_handler.cc
@@ -14,7 +14,7 @@
 #include "base/metrics/histogram.h"
 #include "base/shared_memory.h"
 #include "base/string_number_conversions.h"
-#include "content/browser/debugger/devtools_netlog_observer.h"
+#include "content/browser/devtools/devtools_netlog_observer.h"
 #include "content/browser/host_zoom_map_impl.h"
 #include "content/browser/loader/resource_buffer.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
diff --git a/content/browser/loader/sync_resource_handler.cc b/content/browser/loader/sync_resource_handler.cc
index 9f6a60b..390deed 100644
--- a/content/browser/loader/sync_resource_handler.cc
+++ b/content/browser/loader/sync_resource_handler.cc
@@ -5,7 +5,7 @@
 #include "content/browser/loader/sync_resource_handler.h"
 
 #include "base/logging.h"
-#include "content/browser/debugger/devtools_netlog_observer.h"
+#include "content/browser/devtools/devtools_netlog_observer.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_message_filter.h"
 #include "content/common/resource_messages.h"
diff --git a/content/browser/web_contents/render_view_host_manager.cc b/content/browser/web_contents/render_view_host_manager.cc
index 25a4559..9bfad55 100644
--- a/content/browser/web_contents/render_view_host_manager.cc
+++ b/content/browser/web_contents/render_view_host_manager.cc
@@ -8,7 +8,7 @@
 
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "content/browser/debugger/devtools_manager_impl.h"
+#include "content/browser/devtools/devtools_manager_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index dfbb76d..d324987 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -19,7 +19,7 @@
 #include "content/browser/browser_plugin/browser_plugin_embedder.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/child_process_security_policy_impl.h"
-#include "content/browser/debugger/devtools_manager_impl.h"
+#include "content/browser/devtools/devtools_manager_impl.h"
 #include "content/browser/dom_storage/dom_storage_context_impl.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/browser/download/download_stats.h"
diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc
index 953e868..eaf34fa 100644
--- a/content/browser/worker_host/worker_process_host.cc
+++ b/content/browser/worker_host/worker_process_host.cc
@@ -20,8 +20,8 @@
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/browser_child_process_host_impl.h"
 #include "content/browser/child_process_security_policy_impl.h"
-#include "content/browser/debugger/worker_devtools_manager.h"
-#include "content/browser/debugger/worker_devtools_message_filter.h"
+#include "content/browser/devtools/worker_devtools_manager.h"
+#include "content/browser/devtools/worker_devtools_message_filter.h"
 #include "content/browser/fileapi/fileapi_message_filter.h"
 #include "content/browser/in_process_webkit/indexed_db_dispatcher_host.h"
 #include "content/browser/mime_registry_message_filter.h"
diff --git a/content/browser/worker_host/worker_service_impl.cc b/content/browser/worker_host/worker_service_impl.cc
index c19a389..703b31f 100644
--- a/content/browser/worker_host/worker_service_impl.cc
+++ b/content/browser/worker_host/worker_service_impl.cc
@@ -9,7 +9,7 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/threading/thread.h"
-#include "content/browser/debugger/worker_devtools_manager.h"
+#include "content/browser/devtools/worker_devtools_manager.h"
 #include "content/browser/worker_host/worker_message_filter.h"
 #include "content/browser/worker_host/worker_process_host.h"
 #include "content/common/view_messages.h"
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 368ba681..2e473e9 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -284,26 +284,26 @@
     'browser/child_process_security_policy_impl.h',
     'browser/cross_site_request_manager.cc',
     'browser/cross_site_request_manager.h',
-    'browser/debugger/devtools_agent_host.cc',
-    'browser/debugger/devtools_agent_host.h',
-    'browser/debugger/devtools_browser_target.cc',
-    'browser/debugger/devtools_browser_target.h',
-    'browser/debugger/devtools_frontend_host.cc',
-    'browser/debugger/devtools_frontend_host.h',
-    'browser/debugger/devtools_http_handler_impl.cc',
-    'browser/debugger/devtools_http_handler_impl.h',
-    'browser/debugger/devtools_manager_impl.cc',
-    'browser/debugger/devtools_manager_impl.h',
-    'browser/debugger/devtools_netlog_observer.cc',
-    'browser/debugger/devtools_netlog_observer.h',
-    'browser/debugger/devtools_tracing_handler.h',
-    'browser/debugger/devtools_tracing_handler.cc',
-    'browser/debugger/render_view_devtools_agent_host.cc',
-    'browser/debugger/render_view_devtools_agent_host.h',
-    'browser/debugger/worker_devtools_manager.cc',
-    'browser/debugger/worker_devtools_manager.h',
-    'browser/debugger/worker_devtools_message_filter.cc',
-    'browser/debugger/worker_devtools_message_filter.h',
+    'browser/devtools/devtools_agent_host.cc',
+    'browser/devtools/devtools_agent_host.h',
+    'browser/devtools/devtools_browser_target.cc',
+    'browser/devtools/devtools_browser_target.h',
+    'browser/devtools/devtools_frontend_host.cc',
+    'browser/devtools/devtools_frontend_host.h',
+    'browser/devtools/devtools_http_handler_impl.cc',
+    'browser/devtools/devtools_http_handler_impl.h',
+    'browser/devtools/devtools_manager_impl.cc',
+    'browser/devtools/devtools_manager_impl.h',
+    'browser/devtools/devtools_netlog_observer.cc',
+    'browser/devtools/devtools_netlog_observer.h',
+    'browser/devtools/devtools_tracing_handler.h',
+    'browser/devtools/devtools_tracing_handler.cc',
+    'browser/devtools/render_view_devtools_agent_host.cc',
+    'browser/devtools/render_view_devtools_agent_host.h',
+    'browser/devtools/worker_devtools_manager.cc',
+    'browser/devtools/worker_devtools_manager.h',
+    'browser/devtools/worker_devtools_message_filter.cc',
+    'browser/devtools/worker_devtools_message_filter.h',
     'browser/device_monitor_linux.cc',
     'browser/device_monitor_linux.h',
     'browser/device_monitor_mac.h',
@@ -939,7 +939,7 @@
       ],
     }, {  # OS!="ios"
       'dependencies': [
-        'browser/debugger/devtools_resources.gyp:devtools_resources',
+        'browser/devtools/devtools_resources.gyp:devtools_resources',
         '../cc/cc.gyp:cc',
         '../net/net.gyp:http_server',
         '../printing/printing.gyp:printing',
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 9a3f36f..3c6db0d 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -61,12 +61,12 @@
     'renderer/android/phone_number_detector.h',
     'renderer/device_orientation_dispatcher.cc',
     'renderer/device_orientation_dispatcher.h',
-    'renderer/devtools_agent.cc',
-    'renderer/devtools_agent.h',
-    'renderer/devtools_agent_filter.cc',
-    'renderer/devtools_agent_filter.h',
-    'renderer/devtools_client.cc',
-    'renderer/devtools_client.h',
+    'renderer/devtools/devtools_agent.cc',
+    'renderer/devtools/devtools_agent.h',
+    'renderer/devtools/devtools_agent_filter.cc',
+    'renderer/devtools/devtools_agent_filter.h',
+    'renderer/devtools/devtools_client.cc',
+    'renderer/devtools/devtools_client.h',
     'renderer/disambiguation_popup_helper.cc',
     'renderer/disambiguation_popup_helper.h',
     'renderer/do_not_track_bindings.cc',
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 197ecf0..7153cc8 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -246,7 +246,7 @@
       'target_name': 'content_shell_pak',
       'type': 'none',
       'dependencies': [
-        'browser/debugger/devtools_resources.gyp:devtools_resources',
+        'browser/devtools/devtools_resources.gyp:devtools_resources',
         'content_shell_resources',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
       ],
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index c46ae02..92dcfa5 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -258,8 +258,8 @@
         'browser/browser_thread_unittest.cc',
         'browser/browser_url_handler_impl_unittest.cc',
         'browser/child_process_security_policy_unittest.cc',
-        'browser/debugger/devtools_http_handler_unittest.cc',
-        'browser/debugger/devtools_manager_unittest.cc',
+        'browser/devtools/devtools_http_handler_unittest.cc',
+        'browser/devtools/devtools_manager_unittest.cc',
         'browser/device_orientation/provider_unittest.cc',
         'browser/download/base_file_unittest.cc',
         'browser/download/byte_stream_unittest.cc',
diff --git a/content/renderer/devtools/OWNERS b/content/renderer/devtools/OWNERS
new file mode 100644
index 0000000..bb6028e
--- /dev/null
+++ b/content/renderer/devtools/OWNERS
@@ -0,0 +1,2 @@
+pfeldman@chromium.org
+yurys@chromium.org
diff --git a/content/renderer/devtools_agent.cc b/content/renderer/devtools/devtools_agent.cc
index 91fc3b3..31269b0 100644
--- a/content/renderer/devtools_agent.cc
+++ b/content/renderer/devtools/devtools_agent.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/renderer/devtools_agent.h"
+#include "content/renderer/devtools/devtools_agent.h"
 
 #include <map>
 
@@ -12,16 +12,16 @@
 #include "base/string_number_conversions.h"
 #include "content/common/devtools_messages.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/devtools_agent_filter.h"
-#include "content/renderer/devtools_client.h"
+#include "content/renderer/devtools/devtools_agent_filter.h"
+#include "content/renderer/devtools/devtools_client.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 
 #if defined(USE_TCMALLOC)
 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
diff --git a/content/renderer/devtools_agent.h b/content/renderer/devtools/devtools_agent.h
index 219a767..9efe05ee 100644
--- a/content/renderer/devtools_agent.h
+++ b/content/renderer/devtools/devtools_agent.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_RENDERER_DEVTOOLS_AGENT_H_
-#define CONTENT_RENDERER_DEVTOOLS_AGENT_H_
+#ifndef CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_AGENT_H_
+#define CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_AGENT_H_
 
 #include <string>
 
@@ -70,4 +70,4 @@ class DevToolsAgent : public RenderViewObserver,
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_DEVTOOLS_AGENT_H_
+#endif  // CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_AGENT_H_
diff --git a/content/renderer/devtools_agent_filter.cc b/content/renderer/devtools/devtools_agent_filter.cc
index f640c59..4aca9ac 100644
--- a/content/renderer/devtools_agent_filter.cc
+++ b/content/renderer/devtools/devtools_agent_filter.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/devtools_agent_filter.h"
+#include "content/renderer/devtools/devtools_agent_filter.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "content/common/devtools_messages.h"
-#include "content/renderer/devtools_agent.h"
+#include "content/renderer/devtools/devtools_agent.h"
 #include "content/renderer/plugin_channel_host.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
diff --git a/content/renderer/devtools_agent_filter.h b/content/renderer/devtools/devtools_agent_filter.h
index 627f749..9e4f8ae 100644
--- a/content/renderer/devtools_agent_filter.h
+++ b/content/renderer/devtools/devtools_agent_filter.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_RENDERER_DEVTOOLS_AGENT_FILTER_H_
-#define CONTENT_RENDERER_DEVTOOLS_AGENT_FILTER_H_
+#ifndef CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_AGENT_FILTER_H_
+#define CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_AGENT_FILTER_H_
 
 #include <string>
 
@@ -45,4 +45,4 @@ class DevToolsAgentFilter : public IPC::ChannelProxy::MessageFilter {
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_DEVTOOLS_AGENT_FILTER_H_
+#endif  // CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_AGENT_FILTER_H_
diff --git a/content/renderer/devtools_client.cc b/content/renderer/devtools/devtools_client.cc
index d4ea447..09ec506 100644
--- a/content/renderer/devtools_client.cc
+++ b/content/renderer/devtools/devtools_client.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/renderer/devtools_client.h"
+#include "content/renderer/devtools/devtools_client.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
diff --git a/content/renderer/devtools_client.h b/content/renderer/devtools/devtools_client.h
index 7e93008..f5fa8f0 100644
--- a/content/renderer/devtools_client.h
+++ b/content/renderer/devtools/devtools_client.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_RENDERER_DEVTOOLS_CLIENT_H_
-#define CONTENT_RENDERER_DEVTOOLS_CLIENT_H_
+#ifndef CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_CLIENT_H_
+#define CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_CLIENT_H_
 
 #include <string>
 
@@ -60,4 +60,4 @@ class DevToolsClient : public RenderViewObserver,
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_DEVTOOLS_CLIENT_H_
+#endif  // CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_CLIENT_H_
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 7b52bf1..f7da814 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -48,7 +48,7 @@
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/render_process_observer.h"
 #include "content/public/renderer/render_view_visitor.h"
-#include "content/renderer/devtools_agent_filter.h"
+#include "content/renderer/devtools/devtools_agent_filter.h"
 #include "content/renderer/dom_storage/dom_storage_dispatcher.h"
 #include "content/renderer/dom_storage/webstoragearea_impl.h"
 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 628d3cd..478898b 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -68,7 +68,7 @@
 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h"
 #include "content/renderer/device_orientation_dispatcher.h"
-#include "content/renderer/devtools_agent.h"
+#include "content/renderer/devtools/devtools_agent.h"
 #include "content/renderer/disambiguation_popup_helper.h"
 #include "content/renderer/dom_automation_controller.h"
 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
diff --git a/tools/code_coverage/coverage_posix.py b/tools/code_coverage/coverage_posix.py
index a8670a8..5f29b82 100755
--- a/tools/code_coverage/coverage_posix.py
+++ b/tools/code_coverage/coverage_posix.py
@@ -332,7 +332,7 @@ gTestInclusions = {
          'GeolocationBrowserTest.*',
          # 'src/chrome/browser/nacl_host'
          'NaClGdbTest.*',
-         # 'src/chrome/browser/debugger'
+         # 'src/chrome/browser/devtools'
          'DevToolsSanityTest.*',
          'DevToolsExtensionTest.*',
          'DevToolsExperimentalExtensionTest.*',
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index ab4e344..a78d55c 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -167,7 +167,7 @@
     "includes": [22000],
   },
   # This file is generated during the build.
-  "chrome/browser/debugger/frontend/devtools_discovery_page_resources.grd": {
+  "chrome/browser/devtools/frontend/devtools_discovery_page_resources.grd": {
     "includes": [22500],
   },
   "chrome/browser/resources/options_resources.grd": {