Revert 50726 "DevTools: Migrate to new WebView initialization (pass devtools client directly)."

webkit/tools/test_shell/test_shell_devtools_agent.cc

 // 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.
 
 #include "webkit/tools/test_shell/test_shell_devtools_agent.h"
 
 #include "base/message_loop.h"
 #include "grit/webkit_chromium_resources.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
@@ skipping 39 matching lines @@
   current->RunAllPending();
   current->SetNestableTasksAllowed(old_state);
 }
 
 // Warning at call_method_factory_(this) treated as error is switched off.
 
 #if defined(OS_WIN)
 #pragma warning(disable : 4355)
 #endif // defined(OS_WIN)
 
-TestShellDevToolsAgent::TestShellDevToolsAgent()
+TestShellDevToolsAgent::TestShellDevToolsAgent(WebView* web_view)
     : call_method_factory_(this),
-      dev_tools_client_(NULL) {
+      dev_tools_client_(NULL),
+      web_view_(web_view) {
   static int dev_tools_agent_counter;
   routing_id_ = ++dev_tools_agent_counter;
   if (routing_id_ == 1)
     WebDevToolsAgent::setMessageLoopDispatchHandler(
         &TestShellDevToolsAgent::DispatchMessageLoop);
-}
-
-void TestShellDevToolsAgent::SetWebView(WebKit::WebView* web_view) {
-  web_view_ = web_view;
+  web_dev_tools_agent_ = WebDevToolsAgent::create(web_view_, this);
+  web_view_->setDevToolsAgent(web_dev_tools_agent_);
 }
 
 void TestShellDevToolsAgent::sendMessageToFrontend(
        const WebDevToolsMessageData& data) {
   if (dev_tools_client_)
     dev_tools_client_->AsyncCall(TestShellDevToolsCallArgs(data));
 }
 
 void TestShellDevToolsAgent::forceRepaint() {
 }
@@ skipping 74 matching lines @@
 
 bool TestShellDevToolsAgent::evaluateInWebInspector(
       long call_id,
       const std::string& script) {
   WebDevToolsAgent* agent = GetWebAgent();
   if (!agent)
     return false;
   agent->evaluateInWebInspector(call_id, WebString::fromUTF8(script));
   return true;
 }