2 files changed, 8 insertions, 10 deletions
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.cc b/webkit/tools/test_shell/test_shell_devtools_agent.cc
index d517709..eeec750 100644
--- a/webkit/tools/test_shell/test_shell_devtools_agent.cc
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.cc
@@ -2,24 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h"
-#include "third_party/WebKit/WebKit/chromium/src/WebViewImpl.h"
+#include "webkit/tools/test_shell/test_shell_devtools_agent.h"
 
-#undef LOG
+#include "base/message_loop.h"
 #include "grit/webkit_chromium_resources.h"
-#include "webkit/tools/test_shell/test_shell_devtools_agent.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/tools/test_shell/test_shell_devtools_callargs.h"
 #include "webkit/tools/test_shell/test_shell_devtools_client.h"
 #include "webkit/glue/webkit_glue.h"
 
-#include "base/message_loop.h"
-
 using WebKit::WebCString;
 using WebKit::WebDevToolsAgent;
 using WebKit::WebDevToolsMessageData;
 using WebKit::WebString;
 using WebKit::WebView;
-using WebKit::WebViewImpl;
 
 // static
 void TestShellDevToolsAgent::DispatchMessageLoop() {
@@ -39,7 +36,7 @@ void TestShellDevToolsAgent::DispatchMessageLoop() {
 TestShellDevToolsAgent::TestShellDevToolsAgent(WebView* web_view)
     : call_method_factory_(this),
       dev_tools_client_(NULL),
-      web_view_(static_cast<WebViewImpl*>(web_view)) {
+      web_view_(web_view) {
   static int dev_tools_agent_counter;
   routing_id_ = ++dev_tools_agent_counter;
   if (routing_id_ == 1)
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.h b/webkit/tools/test_shell/test_shell_devtools_agent.h
index 9ce2498..6bde4ca 100644
--- a/webkit/tools/test_shell/test_shell_devtools_agent.h
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.h
@@ -11,7 +11,8 @@
 
 namespace WebKit {
 
-class WebViewImpl;
+class WebDevToolsAgent;
+class WebView;
 struct WebDevToolsMessageData;
 
 } // namespace WebKit
@@ -52,7 +53,7 @@ class TestShellDevToolsAgent : public WebKit::WebDevToolsAgentClient {
   TestShellDevToolsClient* dev_tools_client_;
   int routing_id_;
   WebKit::WebDevToolsAgent* web_dev_tools_agent_;
-  WebKit::WebViewImpl* web_view_;
+  WebKit::WebView* web_view_;
 
   DISALLOW_COPY_AND_ASSIGN(TestShellDevToolsAgent);
 };