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

webkit/tools/test_shell/test_shell_win.cc

Index: webkit/tools/test_shell/test_shell_win.cc
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
old mode 100755
new mode 100644
index 079a83026c4a0c27e49f621d514dd48a088bf557..841d724b92e94a588e721cdfd4c0881f6e578023
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -34,7 +34,6 @@
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/tools/test_shell/resource.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
-#include "webkit/tools/test_shell/test_shell_devtools_agent.h"
 #include "webkit/tools/test_shell/test_shell_switches.h"
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
@@ -393,17 +392,13 @@ bool TestShell::Initialize(const GURL& starting_url) {
       win_util::SetWindowProc(m_editWnd, TestShell::EditWndProc);
   win_util::SetWindowUserData(m_editWnd, this);
 
-  dev_tools_agent_.reset(new TestShellDevToolsAgent());
-
   // create webview
   m_webViewHost.reset(
-      WebViewHost::Create(m_mainWnd,
-                          delegate_.get(),
-                          dev_tools_agent_.get(),
-                          *TestShell::web_prefs_));
-  dev_tools_agent_->SetWebView(m_webViewHost->webview());
+      WebViewHost::Create(m_mainWnd, delegate_.get(), *TestShell::web_prefs_));
   delegate_->RegisterDragDrop();
 
+  InitializeDevToolsAgent(webView());
+
   // Load our initial content.
   if (starting_url.is_valid())
     LoadURL(starting_url);