[content shell] ShellRenderProcessObserver no longer depends on WebTestInterfaces.

content/shell/shell_content_renderer_client.cc

Index: content/shell/shell_content_renderer_client.cc
diff --git a/content/shell/shell_content_renderer_client.cc b/content/shell/shell_content_renderer_client.cc
index f342444f62d51e8b1a769edd324b27c638c1d393..5c156183522474fa643abe12cb45e8d9a9b59f5c 100644
--- a/content/shell/shell_content_renderer_client.cc
+++ b/content/shell/shell_content_renderer_client.cc
@@ -48,11 +48,6 @@ bool IsExternalPage(const GURL& url) {
 }  // namespace
 
 ShellContentRendererClient::ShellContentRendererClient() {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
-    EnableWebTestProxyCreation(
-        base::Bind(&ShellContentRendererClient::WebTestProxyCreated,
-                   base::Unretained(this)));
-  }
 }
 
 ShellContentRendererClient::~ShellContentRendererClient() {
@@ -62,6 +57,15 @@ void ShellContentRendererClient::RenderThreadStarted() {
   shell_observer_.reset(new ShellRenderProcessObserver());
 }
 
+void ShellContentRendererClient::RenderViewCreated(RenderView* render_view) {
+  WebKitTestRunner* test_runner = new WebKitTestRunner(render_view);
+  if (!ShellRenderProcessObserver::GetInstance()->test_delegate()) {
+    ShellRenderProcessObserver::GetInstance()->SetMainWindow(render_view,
+                                                             test_runner,
+                                                             test_runner);
+  }
+}
+
 bool ShellContentRendererClient::OverrideCreatePlugin(
     RenderView* render_view,
     WebKit::WebFrame* frame,
@@ -97,30 +101,18 @@ bool ShellContentRendererClient::WillSendRequest(
       ShellRenderProcessObserver::GetInstance();
   if (!command_line->HasSwitch(switches::kAllowExternalPages) &&
       IsExternalPage(url) && !IsExternalPage(first_party_for_cookies)) {
-    render_process_observer->test_delegate()->printMessage(
-        std::string("Blocked access to external URL " + url.spec() + "\n"));
+    if (render_process_observer->test_delegate()) {
+      render_process_observer->test_delegate()->printMessage(
+          std::string("Blocked access to external URL " + url.spec() + "\n"));
+    }
     *new_url = GURL();
     return true;
   }
-  *new_url = render_process_observer->test_delegate()->rewriteLayoutTestsURL(
-      url.spec());
-  return true;
-}
-
-void ShellContentRendererClient::WebTestProxyCreated(RenderView* render_view,
-                                                     WebTestProxyBase* proxy) {
-  WebKitTestRunner* test_runner = new WebKitTestRunner(render_view);
-  if (!ShellRenderProcessObserver::GetInstance()->test_delegate()) {
-    ShellRenderProcessObserver::GetInstance()->SetMainWindow(render_view,
-                                                             test_runner,
-                                                             test_runner);
+  if (render_process_observer->test_delegate()) {
+    *new_url = render_process_observer->test_delegate()->rewriteLayoutTestsURL(
+        url.spec());
   }
-  test_runner->set_proxy(proxy);
-  proxy->setDelegate(
-      ShellRenderProcessObserver::GetInstance()->test_delegate());
-  proxy->setInterfaces(
-      ShellRenderProcessObserver::GetInstance()->test_interfaces());
-  render_view->GetWebView()->setSpellCheckClient(proxy->spellCheckClient());
+  return true;
 }
 
 }  // namespace content