Revert "Roll to WebKit 46417. DevTools: Migrate from InspectorController to InspectorBackend."

This reverts commit 836fec2217b4a8ddb16c957b4b86f72252e31ce3.

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

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

1 files changed, 19 insertions, 6 deletions

diff --git a/webkit/glue/webdevtoolsclient_impl.cc b/webkit/glue/webdevtoolsclient_impl.cc
index 6095e61..4c25481 100644
--- a/webkit/glue/webdevtoolsclient_impl.cc
+++ b/webkit/glue/webdevtoolsclient_impl.cc
@@ -9,7 +9,6 @@
 #include "Document.h"
 #include "DOMWindow.h"
 #include "Frame.h"
-#include "InspectorBackend.h"
 #include "InspectorController.h"
 #include "Node.h"
 #include "Page.h"
@@ -69,9 +68,12 @@ class ToolsAgentNativeDelegateImpl : public ToolsAgentNativeDelegate {
 
     InspectorController* ic = frame_->frame()->page()->inspectorController();
     if (request.frame && request.frame->attached()) {
-      ic->inspectorBackend()->addSourceToFrame(request.mime_type,
-                                               content,
-                                               request.frame.get());
+      // There is a breaking change pending upstream. addSourceToFrame now
+      // lives in InspectorBackend. Following code should be replaced with:
+      // ic->inspectorBackend()->addSourceToFrame(request.mime_type,
+      //                                          content,
+      //                                          request.frame.get());
+      ic->addSourceToFrame(request.mime_type, content, request.frame.get());
     }
   }
 
@@ -166,9 +168,16 @@ WebDevToolsClientImpl::WebDevToolsClientImpl(
   dev_tools_host_->AddProtoFunction(
       "loaded",
       WebDevToolsClientImpl::JsLoaded);
+  // There is a breaking change pending upstream.
+  // v8InspectorControllerSearchCallback is now
+  // v8InspectorBackendSearchCallback.
+  // Following code should be replaced with:
+  // dev_tools_host_->AddProtoFunction(
+  //     "search",
+  //     WebCore::V8Custom::v8InspectorBackendSearchCallback);
   dev_tools_host_->AddProtoFunction(
       "search",
-      WebCore::V8Custom::v8InspectorBackendSearchCallback);
+      WebCore::V8Custom::v8InspectorControllerSearchCallback);
   dev_tools_host_->AddProtoFunction(
       "getPlatform",
       WebDevToolsClientImpl::JsGetPlatform);
@@ -276,7 +285,11 @@ v8::Handle<v8::Value> WebDevToolsClientImpl::JsAddSourceToFrame(
 
   Page* page = V8Proxy::retrieveFrameForEnteredContext()->page();
   InspectorController* inspectorController = page->inspectorController();
-  return WebCore::v8Boolean(inspectorController->inspectorBackend()->
+  // There is a breaking change pending upstream. Following code should be
+  // replaced with:
+  // return WebCore::v8Boolean(inspectorController->inspectorBackend()->
+  //    addSourceToFrame(mime_type, source_string, node));
+  return WebCore::v8Boolean(inspectorController->
       addSourceToFrame(mime_type, source_string, node));
 }