4 files changed, 2 insertions, 36 deletions
diff --git a/content/shell/shell_content_renderer_client.cc b/content/shell/shell_content_renderer_client.cc
index 83d8e98..a17fbe0 100644
--- a/content/shell/shell_content_renderer_client.cc
+++ b/content/shell/shell_content_renderer_client.cc
@@ -4,30 +4,19 @@
 
 #include "content/shell/shell_content_renderer_client.h"
 
-#include "base/callback.h"
 #include "base/command_line.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/test/layouttest_support.h"
 #include "content/shell/shell_render_process_observer.h"
 #include "content/shell/shell_switches.h"
 #include "content/shell/webkit_test_runner.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
-#include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h"
 #include "v8/include/v8.h"
 
-using WebTestRunner::WebTestProxyBase;
-
 namespace content {
 
-ShellContentRendererClient::ShellContentRendererClient()
-    : latest_test_runner_(NULL) {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
-    EnableWebTestProxyCreation(
-        base::Bind(&ShellContentRendererClient::WebTestProxyCreated,
-                   base::Unretained(this)));
-  }
+ShellContentRendererClient::ShellContentRendererClient() {
 }
 
 ShellContentRendererClient::~ShellContentRendererClient() {
@@ -41,8 +30,7 @@ void ShellContentRendererClient::RenderViewCreated(RenderView* render_view) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
     return;
 
-  CHECK(!latest_test_runner_);
-  latest_test_runner_ = new WebKitTestRunner(render_view);
+  new WebKitTestRunner(render_view);
 }
 
 bool ShellContentRendererClient::OverrideCreatePlugin(
@@ -60,12 +48,4 @@ bool ShellContentRendererClient::OverrideCreatePlugin(
   return false;
 }
 
-void ShellContentRendererClient::WebTestProxyCreated(WebTestProxyBase* proxy) {
-  CHECK(latest_test_runner_);
-  proxy->setDelegate(latest_test_runner_);
-  latest_test_runner_ = NULL;
-  proxy->setInterfaces(
-      ShellRenderProcessObserver::GetInstance()->test_interfaces());
-}
-
 }  // namespace content
diff --git a/content/shell/shell_content_renderer_client.h b/content/shell/shell_content_renderer_client.h
index f9d49d0..1dff8e2 100644
--- a/content/shell/shell_content_renderer_client.h
+++ b/content/shell/shell_content_renderer_client.h
@@ -15,15 +15,10 @@ class WebPlugin;
 struct WebPluginParams;
 }
 
-namespace WebTestRunner {
-class WebTestProxyBase;
-}
-
 namespace content {
 
 class RenderView;
 class ShellRenderProcessObserver;
-class WebKitTestRunner;
 
 class ShellContentRendererClient : public ContentRendererClient {
  public:
@@ -38,10 +33,7 @@ class ShellContentRendererClient : public ContentRendererClient {
       WebKit::WebPlugin** plugin) OVERRIDE;
 
  private:
-  void WebTestProxyCreated(WebTestRunner::WebTestProxyBase* proxy);
-
   scoped_ptr<ShellRenderProcessObserver> shell_observer_;
-  WebKitTestRunner* latest_test_runner_;
 };
 
 }  // namespace content
diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc
index e78e97b..d3be970 100644
--- a/content/shell/shell_main_delegate.cc
+++ b/content/shell/shell_main_delegate.cc
@@ -106,8 +106,6 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
         switches::kUseGL, gfx::kGLImplementationOSMesaName);
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kIgnoreGpuBlacklist);
-    CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kForceRendererAccessibility);
     net::CookieMonster::EnableFileScheme();
     if (!WebKitTestPlatformInitialize()) {
       if (exit_code)
diff --git a/content/shell/shell_render_process_observer.h b/content/shell/shell_render_process_observer.h
index 42d2cca..b802100 100644
--- a/content/shell/shell_render_process_observer.h
+++ b/content/shell/shell_render_process_observer.h
@@ -38,10 +38,6 @@ class ShellRenderProcessObserver : public RenderProcessObserver {
   virtual void WebKitInitialized() OVERRIDE;
   virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
 
-  WebTestRunner::WebTestInterfaces* test_interfaces() const {
-    return test_interfaces_.get();
-  }
-
  private:
   // Message handlers.
   void OnResetAll();