DevTools: migrate to new WebView constructor.

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

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

11 files changed, 29 insertions, 19 deletions

diff --git a/webkit/tools/test_shell/mac/webview_host.mm b/webkit/tools/test_shell/mac/webview_host.mm
index 1d7af4d..7be0286 100644
--- a/webkit/tools/test_shell/mac/webview_host.mm
+++ b/webkit/tools/test_shell/mac/webview_host.mm
@@ -16,12 +16,14 @@
 #include "webkit/tools/test_shell/test_shell.h"
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
+using WebKit::WebDevToolsAgentClient;
 using WebKit::WebSize;
 using WebKit::WebView;
 
 // static
 WebViewHost* WebViewHost::Create(NSView* parent_view,
                                  TestWebViewDelegate* delegate,
+                                 WebDevToolsAgentClient* dev_tools_client,
                                  const WebPreferences& prefs) {
   WebViewHost* host = new WebViewHost();
 
@@ -37,7 +39,7 @@ WebViewHost* WebViewHost::Create(NSView* parent_view,
   [parent_view addSubview:host->view_];
   [host->view_ release];
 
-  host->webwidget_ = WebView::create(delegate);
+  host->webwidget_ = WebView::create(delegate, dev_tools_client);
   prefs.Apply(host->webview());
   host->webview()->initializeMainFrame(delegate);
   host->webwidget_->resize(WebSize(content_rect.size.width,
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 90c8abc..62bacb2 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -583,11 +583,6 @@ WebView* TestShell::CreateWebView() {
   return new_win->webView();
 }
 
-void TestShell::InitializeDevToolsAgent(WebView* webView) {
-  DCHECK(!dev_tools_agent_.get());
-  dev_tools_agent_.reset(new TestShellDevToolsAgent(webView));
-}
-
 void TestShell::ShowDevTools() {
   if (!devtools_shell_) {
     FilePath dir_exe;
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h
index 21d8856..117e2d2 100644
--- a/webkit/tools/test_shell/test_shell.h
+++ b/webkit/tools/test_shell/test_shell.h
@@ -329,7 +329,6 @@ public:
 protected:
     void CreateDevToolsClient(TestShellDevToolsAgent* agent);
     bool Initialize(const GURL& starting_url);
-    void InitializeDevToolsAgent(WebKit::WebView* webView);
     bool IsSVGTestURL(const GURL& url);
     void SizeToSVG();
     void SizeToDefault();
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.cc b/webkit/tools/test_shell/test_shell_devtools_agent.cc
index 704827d..20e8c16 100644
--- a/webkit/tools/test_shell/test_shell_devtools_agent.cc
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.cc
@@ -57,17 +57,18 @@ void TestShellDevToolsAgent::DispatchMessageLoop() {
 #pragma warning(disable : 4355)
 #endif // defined(OS_WIN)
 
-TestShellDevToolsAgent::TestShellDevToolsAgent(WebView* web_view)
+TestShellDevToolsAgent::TestShellDevToolsAgent()
     : call_method_factory_(this),
-      dev_tools_client_(NULL),
-      web_view_(web_view) {
+      dev_tools_client_(NULL) {
   static int dev_tools_agent_counter;
   routing_id_ = ++dev_tools_agent_counter;
   if (routing_id_ == 1)
     WebDevToolsAgent::setMessageLoopDispatchHandler(
         &TestShellDevToolsAgent::DispatchMessageLoop);
-  web_dev_tools_agent_ = WebDevToolsAgent::create(web_view_, this);
-  web_view_->setDevToolsAgent(web_dev_tools_agent_);
+}
+
+void TestShellDevToolsAgent::SetWebView(WebKit::WebView* web_view) {
+  web_view_ = web_view;
 }
 
 void TestShellDevToolsAgent::sendMessageToFrontend(
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.h b/webkit/tools/test_shell/test_shell_devtools_agent.h
index 8020876..baf7174 100644
--- a/webkit/tools/test_shell/test_shell_devtools_agent.h
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.h
@@ -23,9 +23,11 @@ class TestShellDevToolsClient;
 class TestShellDevToolsAgent : public WebKit::WebDevToolsAgentClient {
 
  public:
-  TestShellDevToolsAgent(WebKit::WebView* web_view);
+  TestShellDevToolsAgent();
   virtual ~TestShellDevToolsAgent() {}
 
+  void SetWebView(WebKit::WebView* web_view);
+
   // WebDevToolsAgentClient implementation.
   virtual void sendMessageToFrontend(
       const WebKit::WebDevToolsMessageData& data);
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index bcf4ec0..92f1f19 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -353,7 +353,7 @@ bool TestShell::Initialize(const GURL& starting_url) {
 
   gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
   m_webViewHost.reset(
-      WebViewHost::Create(vbox, delegate_.get(), *TestShell::web_prefs_));
+      WebViewHost::Create(vbox, delegate_.get(), 0, *TestShell::web_prefs_));
 
   gtk_container_add(GTK_CONTAINER(m_mainWnd), vbox);
   gtk_widget_show_all(GTK_WIDGET(m_mainWnd));
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 2e4041e..9b9b9aa 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -287,6 +287,7 @@ bool TestShell::Initialize(const GURL& starting_url) {
   m_webViewHost.reset(
       WebViewHost::Create([m_mainWnd contentView],
                           delegate_.get(),
+                          0,
                           *TestShell::web_prefs_));
   delegate_->RegisterDragDrop();
   TestShellWebView* web_view =
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 841d724..079a830 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -34,6 +34,7 @@
 #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"
 
@@ -392,13 +393,17 @@ 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(), *TestShell::web_prefs_));
+      WebViewHost::Create(m_mainWnd,
+                          delegate_.get(),
+                          dev_tools_agent_.get(),
+                          *TestShell::web_prefs_));
+  dev_tools_agent_->SetWebView(m_webViewHost->webview());
   delegate_->RegisterDragDrop();
 
-  InitializeDevToolsAgent(webView());
-
   // Load our initial content.
   if (starting_url.is_valid())
     LoadURL(starting_url);
diff --git a/webkit/tools/test_shell/webview_host.h b/webkit/tools/test_shell/webview_host.h
index 2f09dec..897ba02 100644
--- a/webkit/tools/test_shell/webview_host.h
+++ b/webkit/tools/test_shell/webview_host.h
@@ -20,6 +20,7 @@ struct WebPreferences;
 class TestWebViewDelegate;
 
 namespace WebKit {
+class WebDevToolsAgentClient;
 class WebView;
 }
 
@@ -31,6 +32,7 @@ class WebViewHost : public WebWidgetHost {
   // MoveWindow (or equivalent) function.
   static WebViewHost* Create(gfx::NativeView parent_view,
                              TestWebViewDelegate* delegate,
+                             WebKit::WebDevToolsAgentClient* devtools_client,
                              const WebPreferences& prefs);
 
   WebKit::WebView* webview() const;
diff --git a/webkit/tools/test_shell/webview_host_gtk.cc b/webkit/tools/test_shell/webview_host_gtk.cc
index 177b921..60b8a81 100644
--- a/webkit/tools/test_shell/webview_host_gtk.cc
+++ b/webkit/tools/test_shell/webview_host_gtk.cc
@@ -15,18 +15,20 @@
 #include "webkit/glue/webpreferences.h"
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
+using WebKit::WebDevToolsAgentClient;
 using WebKit::WebView;
 
 // static
 WebViewHost* WebViewHost::Create(GtkWidget* parent_view,
                                  TestWebViewDelegate* delegate,
+                                 WebDevToolsAgentClient* dev_tools_client,
                                  const WebPreferences& prefs) {
   WebViewHost* host = new WebViewHost();
 
   host->view_ = WebWidgetHost::CreateWidget(parent_view, host);
   host->plugin_container_manager_.set_host_widget(host->view_);
 
-  host->webwidget_ = WebView::create(delegate);
+  host->webwidget_ = WebView::create(delegate, dev_tools_client);
   prefs.Apply(host->webview());
   host->webview()->initializeMainFrame(delegate);
   host->webwidget_->layout();
diff --git a/webkit/tools/test_shell/webview_host_win.cc b/webkit/tools/test_shell/webview_host_win.cc
index 3c2e9a8..d7cab2d 100644
--- a/webkit/tools/test_shell/webview_host_win.cc
+++ b/webkit/tools/test_shell/webview_host_win.cc
@@ -19,6 +19,7 @@ static const wchar_t kWindowClassName[] = L"WebViewHost";
 /*static*/
 WebViewHost* WebViewHost::Create(HWND parent_view,
                                  TestWebViewDelegate* delegate,
+                                 WebDevToolsAgentClient* dev_tools_client,
                                  const WebPreferences& prefs) {
   WebViewHost* host = new WebViewHost();
 
@@ -41,7 +42,7 @@ WebViewHost* WebViewHost::Create(HWND parent_view,
                              GetModuleHandle(NULL), NULL);
   win_util::SetWindowUserData(host->view_, host);
 
-  host->webwidget_ = WebView::create(delegate);
+  host->webwidget_ = WebView::create(delegate, dev_tools_client);
   prefs.Apply(host->webview());
   host->webview()->initializeMainFrame(delegate);