Use devtool_ prefix instead of dev_tools_ to be consistent with the rest code.

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

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

18 files changed, 71 insertions, 71 deletions

diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 887acde..869ed45 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -396,8 +396,8 @@ input_files = ChromeFileList([
     'dom_ui/chrome_url_data_manager.h',
     'dom_ui/debugger_ui.cc',
     'dom_ui/debugger_ui.h',
-    'dom_ui/dev_tools_ui.cc',
-    'dom_ui/dev_tools_ui.h',
+    'dom_ui/devtools_ui.cc',
+    'dom_ui/devtools_ui.h',
     'dom_ui/dom_ui.cc',
     'dom_ui/dom_ui.h',
     'dom_ui/dom_ui_contents.cc',
diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index 2880e43..b766ab6 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -1498,11 +1498,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\dom_ui\dev_tools_ui.cc"
+				RelativePath=".\dom_ui\devtools_ui.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\dom_ui\dev_tools_ui.h"
+				RelativePath=".\dom_ui\devtools_ui.h"
 				>
 			</File>
 			<File
diff --git a/chrome/browser/dom_ui/dev_tools_ui.cc b/chrome/browser/dom_ui/devtools_ui.cc
index 4930775..61bfc06 100644
--- a/chrome/browser/dom_ui/dev_tools_ui.cc
+++ b/chrome/browser/dom_ui/devtools_ui.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/dom_ui/dev_tools_ui.h"
+#include "chrome/browser/dom_ui/devtools_ui.h"
 
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/common/render_messages.h"
diff --git a/chrome/browser/dom_ui/dev_tools_ui.h b/chrome/browser/dom_ui/devtools_ui.h
index 2387fe5..4abfaba 100644
--- a/chrome/browser/dom_ui/dev_tools_ui.h
+++ b/chrome/browser/dom_ui/devtools_ui.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_DOM_UI_DEV_TOOLS_UI_H_
-#define CHROME_BROWSER_DOM_UI_DEV_TOOLS_UI_H_
+#ifndef CHROME_BROWSER_DOM_UI_DEVTOOLS_UI_H_
+#define CHROME_BROWSER_DOM_UI_DEVTOOLS_UI_H_
 
 #include "chrome/browser/dom_ui/dom_ui.h"
 
@@ -22,4 +22,4 @@ class DevToolsUI : public DOMUI {
   DISALLOW_COPY_AND_ASSIGN(DevToolsUI);
 };
 
-#endif  // CHROME_BROWSER_DOM_UI_DEV_TOOLS_UI_H_
+#endif  // CHROME_BROWSER_DOM_UI_DEVTOOLS_UI_H_
diff --git a/chrome/browser/dom_ui/dom_ui_contents.cc b/chrome/browser/dom_ui/dom_ui_contents.cc
index 4d5f7e3..90e04dd 100644
--- a/chrome/browser/dom_ui/dom_ui_contents.cc
+++ b/chrome/browser/dom_ui/dom_ui_contents.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/dom_ui/dom_ui_contents.h"
 
 #include "chrome/browser/dom_ui/debugger_ui.h"
-#include "chrome/browser/dom_ui/dev_tools_ui.h"
+#include "chrome/browser/dom_ui/devtools_ui.h"
 #include "chrome/browser/dom_ui/dom_ui.h"
 #include "chrome/browser/dom_ui/downloads_ui.h"
 #include "chrome/browser/dom_ui/history_ui.h"
@@ -258,8 +258,8 @@ bool DOMUIContents::InitCurrentUI(bool reload) {
       current_ui_->Init();
       current_url_ = url;
     }
-  } 
-  
+  }
+
   if (current_ui_)
     return true;
 
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index cdb5542..e60e063 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -545,8 +545,8 @@
         'browser/dom_ui/chrome_url_data_manager.h',
         'browser/dom_ui/debugger_ui.cc',
         'browser/dom_ui/debugger_ui.h',
-        'browser/dom_ui/dev_tools_ui.cc',
-        'browser/dom_ui/dev_tools_ui.h',
+        'browser/dom_ui/devtools_ui.cc',
+        'browser/dom_ui/devtools_ui.h',
         'browser/dom_ui/dom_ui.cc',
         'browser/dom_ui/dom_ui.h',
         'browser/dom_ui/dom_ui_contents.cc',
@@ -1207,8 +1207,8 @@
             'browser/bookmarks/bookmark_context_menu.cc',
             'browser/bookmarks/bookmark_drop_info.cc',
             'browser/debugger/debugger_shell_stubs.cc',
-            'browser/dom_ui/dev_tools_ui.cc',
-            'browser/dom_ui/dev_tools_ui.h',
+            'browser/dom_ui/devtools_ui.cc',
+            'browser/dom_ui/devtools_ui.h',
           ],
           'sources': [
             # Build the necessary GTM sources
@@ -1345,12 +1345,12 @@
         'renderer/about_handler.h',
         'renderer/debug_message_handler.cc',
         'renderer/debug_message_handler.h',
-        'renderer/dev_tools_agent.cc',
-        'renderer/dev_tools_agent.h',
-        'renderer/dev_tools_client.cc',
-        'renderer/dev_tools_client.h',
-        'renderer/dev_tools_messages.h',
-        'renderer/dev_tools_messages_internal.h',
+        'renderer/devtools_agent.cc',
+        'renderer/devtools_agent.h',
+        'renderer/devtools_client.cc',
+        'renderer/devtools_client.h',
+        'renderer/devtools_messages.h',
+        'renderer/devtools_messages_internal.h',
         'renderer/dom_ui_bindings.cc',
         'renderer/dom_ui_bindings.h',
         'renderer/external_host_bindings.cc',
diff --git a/chrome/common/ipc_message_macros.h b/chrome/common/ipc_message_macros.h
index 6ac9f2a..7cba911 100644
--- a/chrome/common/ipc_message_macros.h
+++ b/chrome/common/ipc_message_macros.h
@@ -53,7 +53,7 @@
 #include "chrome/common/ipc_sync_message_unittest.h"
 #include "chrome/common/plugin_messages_internal.h"
 #include "chrome/common/render_messages_internal.h"
-#include "chrome/renderer/dev_tools_messages_internal.h"
+#include "chrome/renderer/devtools_messages_internal.h"
 #include "chrome/test/automation/automation_messages_internal.h"
 #include "chrome/common/worker_messages_internal.h"
 #endif
diff --git a/chrome/renderer/dev_tools_messages.h b/chrome/renderer/dev_tools_messages.h
deleted file mode 100644
index 4067730..0000000
--- a/chrome/renderer/dev_tools_messages.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_RENDERER_DEV_TOOLS_MESSAGES_H_
-#define CHROME_RENDERER_DEV_TOOLS_MESSAGES_H_
-
-#define MESSAGES_INTERNAL_FILE "chrome/renderer/dev_tools_messages_internal.h"
-#include "chrome/common/ipc_message_macros.h"
-
-#endif  // CHROME_RENDERER_DEV_TOOLS_MESSAGES_H_
diff --git a/chrome/renderer/dev_tools_agent.cc b/chrome/renderer/devtools_agent.cc
index d66881d..449b250 100644
--- a/chrome/renderer/dev_tools_agent.cc
+++ b/chrome/renderer/devtools_agent.cc
@@ -13,11 +13,11 @@
 // v8 provides thread-safe Api for controlling debugger. In our case v8's Api
 // is being used from this communication agent on the IO thread.
 
-#include "chrome/renderer/dev_tools_agent.h"
+#include "chrome/renderer/devtools_agent.h"
 
 #include "base/message_loop.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/renderer/dev_tools_messages.h"
+#include "chrome/renderer/devtools_messages.h"
 // TODO(yurys): remove this macros once plugins available on other platforms
 #if defined(OS_WIN)
 #include "chrome/renderer/plugin_channel_host.h"
diff --git a/chrome/renderer/dev_tools_agent.h b/chrome/renderer/devtools_agent.h
index 8ee1885..f285e69 100644
--- a/chrome/renderer/dev_tools_agent.h
+++ b/chrome/renderer/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 CHROME_RENDERER_DEV_TOOLS_AGENT_H_
-#define CHROME_RENDERER_DEV_TOOLS_AGENT_H_
+#ifndef CHROME_RENDERER_DEVTOOLS_AGENT_H_
+#define CHROME_RENDERER_DEVTOOLS_AGENT_H_
 
 #include <string>
 
@@ -11,7 +11,7 @@
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/ipc_channel_proxy.h"
-#include "chrome/renderer/dev_tools_messages.h"
+#include "chrome/renderer/devtools_messages.h"
 #include "webkit/glue/debugger_bridge.h"
 #include "webkit/glue/webdevtoolsagent_delegate.h"
 
@@ -79,4 +79,4 @@ class DevToolsAgent : public IPC::ChannelProxy::MessageFilter,
   DISALLOW_COPY_AND_ASSIGN(DevToolsAgent);
 };
 
-#endif  // CHROME_RENDERER_DEV_TOOLS_AGENT_H_
+#endif  // CHROME_RENDERER_DEVTOOLS_AGENT_H_
diff --git a/chrome/renderer/dev_tools_client.cc b/chrome/renderer/devtools_client.cc
index eb1523d..f3f84b1 100644
--- a/chrome/renderer/dev_tools_client.cc
+++ b/chrome/renderer/devtools_client.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/renderer/dev_tools_client.h"
+#include "chrome/renderer/devtools_client.h"
 
 #include "chrome/common/render_messages.h"
-#include "chrome/renderer/dev_tools_messages.h"
+#include "chrome/renderer/devtools_messages.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "webkit/glue/webdevtoolsclient.h"
diff --git a/chrome/renderer/dev_tools_client.h b/chrome/renderer/devtools_client.h
index 4419a4f..0098eb8 100644
--- a/chrome/renderer/dev_tools_client.h
+++ b/chrome/renderer/devtools_client.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_RENDERER_DEV_TOOLS_CLIENT_H_
-#define CHROME_RENDERER_DEV_TOOLS_CLIENT_H_
+#ifndef CHROME_RENDERER_DEVTOOLS_CLIENT_H_
+#define CHROME_RENDERER_DEVTOOLS_CLIENT_H_
 
 #include <string>
 
 #include "base/scoped_ptr.h"
-#include "chrome/renderer/dev_tools_messages.h"
+#include "chrome/renderer/devtools_messages.h"
 #include "webkit/glue/webdevtoolsclient_delegate.h"
 
 namespace IPC {
@@ -49,4 +49,4 @@ class DevToolsClient : public WebDevToolsClientDelegate {
   DISALLOW_COPY_AND_ASSIGN(DevToolsClient);
 };
 
-#endif  // CHROME_RENDERER_DEV_TOOLS_CLIENT_H_
+#endif  // CHROME_RENDERER_DEVTOOLS_CLIENT_H_
diff --git a/chrome/renderer/devtools_messages.h b/chrome/renderer/devtools_messages.h
new file mode 100644
index 0000000..709d51f
--- /dev/null
+++ b/chrome/renderer/devtools_messages.h
@@ -0,0 +1,11 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_RENDERER_DEVTOOLS_MESSAGES_H_
+#define CHROME_RENDERER_DEVTOOLS_MESSAGES_H_
+
+#define MESSAGES_INTERNAL_FILE "chrome/renderer/devtools_messages_internal.h"
+#include "chrome/common/ipc_message_macros.h"
+
+#endif  // CHROME_RENDERER_DEVTOOLS_MESSAGES_H_
diff --git a/chrome/renderer/dev_tools_messages_internal.h b/chrome/renderer/devtools_messages_internal.h
index 49eee11..49eee11 100644
--- a/chrome/renderer/dev_tools_messages_internal.h
+++ b/chrome/renderer/devtools_messages_internal.h
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index cc46bda..dab8043 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -27,8 +27,8 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/about_handler.h"
 #include "chrome/renderer/debug_message_handler.h"
-#include "chrome/renderer/dev_tools_agent.h"
-#include "chrome/renderer/dev_tools_client.h"
+#include "chrome/renderer/devtools_agent.h"
+#include "chrome/renderer/devtools_client.h"
 #include "chrome/renderer/localized_error.h"
 #include "chrome/renderer/media/audio_renderer_impl.h"
 #include "chrome/renderer/render_process.h"
@@ -179,8 +179,8 @@ RenderView::RenderView(RenderThreadBase* render_thread)
       method_factory_(this),
       first_default_plugin_(NULL),
       printed_document_width_(0),
-      dev_tools_agent_(NULL),
-      dev_tools_client_(NULL),
+      devtools_agent_(NULL),
+      devtools_client_(NULL),
       history_back_list_count_(0),
       history_forward_list_count_(0),
       disable_popup_blocking_(false),
@@ -207,8 +207,8 @@ RenderView::~RenderView() {
 
   render_thread_->RemoveFilter(debug_message_handler_);
 
-  dev_tools_agent_->RenderViewDestroyed();
-  render_thread_->RemoveFilter(dev_tools_agent_);
+  devtools_agent_->RenderViewDestroyed();
+  render_thread_->RemoveFilter(devtools_agent_);
 
 #ifdef CHROME_PERSONALIZATION
   Personalization::CleanupRendererPersonalization(personalization_);
@@ -295,7 +295,7 @@ void RenderView::Init(gfx::NativeViewId parent_hwnd,
     decrement_shared_popup_at_destruction_ = false;
   }
 
-  dev_tools_agent_ = new DevToolsAgent(routing_id, this,
+  devtools_agent_ = new DevToolsAgent(routing_id, this,
       MessageLoop::current());
   webwidget_ = WebView::Create(this, webkit_prefs);
 
@@ -329,7 +329,7 @@ void RenderView::Init(gfx::NativeViewId parent_hwnd,
   debug_message_handler_ = new DebugMessageHandler(this);
   render_thread_->AddFilter(debug_message_handler_);
 
-  render_thread_->AddFilter(dev_tools_agent_);
+  render_thread_->AddFilter(devtools_agent_);
 }
 
 void RenderView::OnMessageReceived(const IPC::Message& message) {
@@ -340,7 +340,7 @@ void RenderView::OnMessageReceived(const IPC::Message& message) {
 #endif
 
   // If this is developer tools renderer intercept tools messages first.
-  if (dev_tools_client_.get() && dev_tools_client_->OnMessageReceived(message))
+  if (devtools_client_.get() && devtools_client_->OnMessageReceived(message))
     return;
 
   IPC_BEGIN_MESSAGE_MAP(RenderView, message)
@@ -904,8 +904,8 @@ void RenderView::OnShowJavaScriptConsole() {
 }
 
 void RenderView::OnSetupDevToolsClient() {
-  DCHECK(!dev_tools_client_.get());
-  dev_tools_client_.reset(new DevToolsClient(this));
+  DCHECK(!devtools_client_.get());
+  devtools_client_.reset(new DevToolsClient(this));
 }
 
 void RenderView::OnStopFinding(bool clear_selection) {
@@ -2472,7 +2472,7 @@ void RenderView::DownloadUrl(const GURL& url, const GURL& referrer) {
 }
 
 WebDevToolsAgentDelegate* RenderView::GetWebDevToolsAgentDelegate() {
-  return dev_tools_agent_;
+  return devtools_agent_;
 }
 
 WebFrame* RenderView::GetChildFrame(const std::wstring& frame_xpath) const {
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index e928750..7263cb7 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -743,11 +743,11 @@ class RenderView : public RenderWidget,
   scoped_refptr<DebugMessageHandler> debug_message_handler_;
 
   // Provides access to this renderer from the remote Inspector UI.
-  scoped_refptr<DevToolsAgent> dev_tools_agent_;
+  scoped_refptr<DevToolsAgent> devtools_agent_;
 
   // DevToolsClient for renderer hosting developer tools UI. It's NULL for other
   // render views.
-  scoped_ptr<DevToolsClient> dev_tools_client_;
+  scoped_ptr<DevToolsClient> devtools_client_;
 
   scoped_ptr<WebFileChooserCallback> file_chooser_;
 
diff --git a/chrome/renderer/renderer.scons b/chrome/renderer/renderer.scons
index e7a22d2..5c6633f 100644
--- a/chrome/renderer/renderer.scons
+++ b/chrome/renderer/renderer.scons
@@ -65,12 +65,12 @@ input_files = ChromeFileList([
     'about_handler.h',
     'debug_message_handler.cc',
     'debug_message_handler.h',
-    'dev_tools_agent.cc',
-    'dev_tools_agent.h',
-    'dev_tools_client.cc',
-    'dev_tools_client.h',
-    'dev_tools_messages.h',
-    'dev_tools_messages_internal.h',
+    'devtools_agent.cc',
+    'devtools_agent.h',
+    'devtools_client.cc',
+    'devtools_client.h',
+    'devtools_messages.h',
+    'devtools_messages_internal.h',
     'dom_ui_bindings.cc',
     'dom_ui_bindings.h',
     'external_host_bindings.cc',
diff --git a/chrome/renderer/renderer.vcproj b/chrome/renderer/renderer.vcproj
index ce21c83..4ec5331 100644
--- a/chrome/renderer/renderer.vcproj
+++ b/chrome/renderer/renderer.vcproj
@@ -210,27 +210,27 @@
 			>
 		</File>
 		<File
-			RelativePath=".\dev_tools_agent.cc"
+			RelativePath=".\devtools_agent.cc"
 			>
 		</File>
 		<File
-			RelativePath=".\dev_tools_agent.h"
+			RelativePath=".\devtools_agent.h"
 			>
 		</File>
 		<File
-			RelativePath=".\dev_tools_client.cc"
+			RelativePath=".\devtools_client.cc"
 			>
 		</File>
 		<File
-			RelativePath=".\dev_tools_client.h"
+			RelativePath=".\devtools_client.h"
 			>
 		</File>
 		<File
-			RelativePath=".\dev_tools_messages.h"
+			RelativePath=".\devtools_messages.h"
 			>
 		</File>
 		<File
-			RelativePath=".\dev_tools_messages_internal.h"
+			RelativePath=".\devtools_messages_internal.h"
 			>
 		</File>
 		<File