DevTools: Get rid of DevTools RPC.

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

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

7 files changed, 12 insertions, 22 deletions

diff --git a/webkit/glue/devtools_message_data.cc b/webkit/glue/devtools_message_data.cc
index a9af3c5..94b7408 100644
--- a/webkit/glue/devtools_message_data.cc
+++ b/webkit/glue/devtools_message_data.cc
@@ -5,11 +5,9 @@
 #include "webkit/glue/devtools_message_data.h"
 
 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsMessageData.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 
-using WebKit::WebDevToolsMessageData;
 using WebKit::WebString;
-using WebKit::WebVector;
 
 DevToolsMessageData::DevToolsMessageData(const WebDevToolsMessageData& data)
     : class_name(data.className.utf8()),
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index f63802d..7aadc4d 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -142,8 +142,6 @@
         # This list contains all .h, .cc, and .mm files in glue except for
         # those in the test subdirectory and those with unittest in in their
         # names.
-        'devtools_message_data.cc',
-        'devtools_message_data.h',
         'media/buffered_data_source.cc',
         'media/buffered_data_source.h',
         'media/media_resource_loader_bridge_factory.cc',
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.cc b/webkit/tools/test_shell/test_shell_devtools_agent.cc
index 20e8c16..24f83d4 100644
--- a/webkit/tools/test_shell/test_shell_devtools_agent.cc
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.cc
@@ -71,8 +71,8 @@ void TestShellDevToolsAgent::SetWebView(WebKit::WebView* web_view) {
   web_view_ = web_view;
 }
 
-void TestShellDevToolsAgent::sendMessageToFrontend(
-       const WebDevToolsMessageData& data) {
+void TestShellDevToolsAgent::sendMessageToInspectorFrontend(
+       const WebString& data) {
   if (dev_tools_client_)
     dev_tools_client_->AsyncCall(TestShellDevToolsCallArgs(data));
 }
@@ -119,7 +119,7 @@ void TestShellDevToolsAgent::AsyncCall(const TestShellDevToolsCallArgs &args) {
 void TestShellDevToolsAgent::Call(const TestShellDevToolsCallArgs &args) {
   WebDevToolsAgent* web_agent = GetWebAgent();
   if (web_agent)
-    web_agent->dispatchMessageFromFrontend(args.data_);
+    web_agent->dispatchOnInspectorBackend(args.data_);
   if (TestShellDevToolsCallArgs::calls_count() == 1 && dev_tools_client_)
     dev_tools_client_->all_messages_processed();
 }
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.h b/webkit/tools/test_shell/test_shell_devtools_agent.h
index baf7174..994c6b2 100644
--- a/webkit/tools/test_shell/test_shell_devtools_agent.h
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.h
@@ -29,8 +29,8 @@ class TestShellDevToolsAgent : public WebKit::WebDevToolsAgentClient {
   void SetWebView(WebKit::WebView* web_view);
 
   // WebDevToolsAgentClient implementation.
-  virtual void sendMessageToFrontend(
-      const WebKit::WebDevToolsMessageData& data);
+  virtual void sendMessageToInspectorFrontend(
+      const WebKit::WebString& data);
   virtual int hostIdentifier() { return routing_id_; }
   virtual void forceRepaint();
   virtual void runtimeFeatureStateChanged(const WebKit::WebString& feature,
diff --git a/webkit/tools/test_shell/test_shell_devtools_callargs.h b/webkit/tools/test_shell/test_shell_devtools_callargs.h
index 3fd7632..92106ec 100644
--- a/webkit/tools/test_shell/test_shell_devtools_callargs.h
+++ b/webkit/tools/test_shell/test_shell_devtools_callargs.h
@@ -7,19 +7,13 @@
 
 #include "base/logging.h"
 
-#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsMessageData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 
 class TestShellDevToolsCallArgs {
  public:
-  TestShellDevToolsCallArgs(const WebKit::WebDevToolsMessageData& data)
+  TestShellDevToolsCallArgs(const WebKit::WebString& data)
       : data_(data) {
     ++calls_count_;
-
-    // The same behaiviour as we have in case of IPC.
-    for (size_t i = 0; i < data_.arguments.size(); ++i)
-      if (data_.arguments[i].isNull())
-        data_.arguments[i] = WebKit::WebString::fromUTF8("");
   }
 
   TestShellDevToolsCallArgs(const TestShellDevToolsCallArgs& args)
@@ -34,7 +28,7 @@ class TestShellDevToolsCallArgs {
 
   static int calls_count() { return calls_count_; }
 
-  WebKit::WebDevToolsMessageData data_;
+  WebKit::WebString data_;
 
  private:
   static int calls_count_;
diff --git a/webkit/tools/test_shell/test_shell_devtools_client.cc b/webkit/tools/test_shell/test_shell_devtools_client.cc
index f1caaf7..fe445641 100644
--- a/webkit/tools/test_shell/test_shell_devtools_client.cc
+++ b/webkit/tools/test_shell/test_shell_devtools_client.cc
@@ -49,8 +49,8 @@ TestShellDevToolsClient::~TestShellDevToolsClient() {
     dev_tools_agent_->detach(this);
 }
 
-void TestShellDevToolsClient::sendMessageToAgent(
-     const WebDevToolsMessageData& data) {
+void TestShellDevToolsClient::sendMessageToBackend(
+     const WebString& data) {
   if (dev_tools_agent_)
     dev_tools_agent_->AsyncCall(TestShellDevToolsCallArgs(data));
 }
@@ -85,7 +85,7 @@ void TestShellDevToolsClient::AsyncCall(const TestShellDevToolsCallArgs &args) {
 }
 
 void TestShellDevToolsClient::Call(const TestShellDevToolsCallArgs &args) {
-  web_tools_frontend_->dispatchMessageFromAgent(args.data_);
+  web_tools_frontend_->dispatchOnInspectorFrontend(args.data_);
   if (TestShellDevToolsCallArgs::calls_count() == 1)
     all_messages_processed();
 }
diff --git a/webkit/tools/test_shell/test_shell_devtools_client.h b/webkit/tools/test_shell/test_shell_devtools_client.h
index 4663bca..d130cfd 100644
--- a/webkit/tools/test_shell/test_shell_devtools_client.h
+++ b/webkit/tools/test_shell/test_shell_devtools_client.h
@@ -28,7 +28,7 @@ class TestShellDevToolsClient: public WebKit::WebDevToolsFrontendClient {
   virtual ~TestShellDevToolsClient();
 
   // WebDevToolsFrontendClient implementation
-  virtual void sendMessageToAgent(const WebKit::WebDevToolsMessageData& data);
+  virtual void sendMessageToBackend(const WebKit::WebString& data);
   virtual void sendDebuggerCommandToAgent(const WebKit::WebString& command);
 
   virtual void activateWindow();