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

webkit/tools/test_shell/test_shell_win.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.h"
 
 #include <windows.h>
 #include <commdlg.h>
 #include <objbase.h>
 #include <process.h>
@@ skipping 16 matching lines @@
 #include "net/base/net_module.h"
 #include "net/url_request/url_request_file_job.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 #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"
 
 using WebKit::WebWidget;
 
 #define MAX_LOADSTRING 100
 
 #define BUTTON_WIDTH 72
 #define URLBAR_HEIGHT  24
 
@@ skipping 338 matching lines @@
   // this control is positioned by ResizeSubViews
   m_editWnd = CreateWindow(L"EDIT", 0,
                            WS_CHILD | WS_VISIBLE | WS_BORDER | ES_LEFT |
                            ES_AUTOVSCROLL | ES_AUTOHSCROLL,
                            x, 0, 0, 0, m_mainWnd, 0, instance_handle_, 0);
 
   default_edit_wnd_proc_ =
       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);
 
   ShowWindow(webViewWnd(), SW_SHOW);
 
   if (IsSVGTestURL(starting_url)) {
     SizeToSVG();
   } else {
     SizeToDefault();
@@ skipping 392 matching lines @@
 
 bool EnsureFontLoaded(HFONT font) {
   return true;
 }
 
 bool DownloadUrl(const std::string& url, HWND caller_window) {
   return false;
 }
 
 }  // namespace webkit_glue