Revert 167341 - Use the WebTestProxy for layout tests in content_shell

- Add a hook to the content renderer client to allow embedders to override the
  creation of RenderViewImpls. To simplify this, I consolidate the parameters
  passed to RVI's constructor into a struct.

- Add a content_layouttest_support library that provides a method for creating
  a modified RenderViewImpl suitable for running layout tests.

- Use above library from the content_shell.

BUG=111316
TEST=almost all accessibility tests pass.

Review URL: https://codereview.chromium.org/11362161

TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/11275276

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

14 files changed, 63 insertions, 266 deletions

diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 22fd103..b7b99d9 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -221,8 +221,6 @@
     'renderer/render_view_impl.cc',
     'renderer/render_view_impl.h',
     'renderer/render_view_impl_android.cc',
-    'renderer/render_view_impl_params.cc',
-    'renderer/render_view_impl_params.h',
     'renderer/render_view_linux.cc',
     'renderer/render_view_mouse_lock_dispatcher.cc',
     'renderer/render_view_mouse_lock_dispatcher.h',
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index eccd921..b622bea 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -30,7 +30,6 @@
         'content_shell_resources',
         'content_utility',
         'content_worker',
-        'test_support_content',
         'content_resources.gyp:content_resources',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 0c6ae71..42c4ef1 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -36,7 +36,6 @@
         'public/test/download_test_observer.cc',
         'public/test/download_test_observer.h',
         'public/test/js_injection_ready_observer.h',
-        'public/test/layouttest_support.h',
         'public/test/mock_download_item.cc',
         'public/test/mock_download_item.h',
         'public/test/mock_download_manager.cc',
@@ -105,7 +104,6 @@
         'test/gpu/gpu_test_config.h',
         'test/gpu/gpu_test_expectations_parser.cc',
         'test/gpu/gpu_test_expectations_parser.h',
-        'test/layouttest_support.cc',
         'test/mock_keyboard.cc',
         'test/mock_keyboard_driver_win.cc',
         'test/mock_keyboard_driver_win.h',
@@ -167,7 +165,6 @@
             '../ppapi/ppapi_internal.gyp:ppapi_shared',
             '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
             '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
-            '<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner',
             '../ui/surface/surface.gyp:surface',
             '../webkit/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
             '../webkit/support/webkit_support.gyp:webkit_storage',
@@ -435,6 +432,8 @@
         '../webkit/fileapi/media/native_media_file_util_unittest.cc',
         '../webkit/fileapi/mock_file_change_observer.cc',
         '../webkit/fileapi/mock_file_change_observer.h',
+        '../webkit/fileapi/mock_file_system_options.cc',
+        '../webkit/fileapi/mock_file_system_options.h',
         '../webkit/fileapi/obfuscated_file_util_unittest.cc',
         '../webkit/fileapi/sandbox_mount_point_provider_unittest.cc',
         '../webkit/fileapi/syncable/canned_syncable_file_system.cc',
diff --git a/content/public/test/layouttest_support.h b/content/public/test/layouttest_support.h
deleted file mode 100644
index b625d54..0000000
--- a/content/public/test/layouttest_support.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2012 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.
-
-#ifndef CONTENT_PUBLIC_TEST_LAYOUTTEST_SUPPORT_H_
-#define CONTENT_PUBLIC_TEST_LAYOUTTEST_SUPPORT_H_
-
-#include "base/callback_forward.h"
-
-namespace WebTestRunner {
-class WebTestProxyBase;
-}
-
-namespace content {
-
-// Enable injecting of a WebTestProxy between WebViews and RenderViews.
-// |callback| is invoked with a pointer to WebTestProxyBase for each created
-// WebTestProxy.
-void EnableWebTestProxyCreation(
-    const base::Callback<void(WebTestRunner::WebTestProxyBase*)>& callback);
-
-}  // namespace content
-
-#endif  // CONTENT_PUBLIC_TEST_LAYOUTTEST_SUPPORT_H_
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index b70206b..6c4573f 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -88,7 +88,6 @@
 #include "content/renderer/plugin_channel_host.h"
 #include "content/renderer/render_process.h"
 #include "content/renderer/render_thread_impl.h"
-#include "content/renderer/render_view_impl_params.h"
 #include "content/renderer/render_view_mouse_lock_dispatcher.h"
 #include "content/renderer/render_widget_fullscreen_pepper.h"
 #include "content/renderer/renderer_accessibility.h"
@@ -360,9 +359,6 @@ static const float kScalingIncrementForGesture = 0.01f;
 static const size_t kContentIntentDelayMilliseconds = 700;
 #endif
 
-static RenderViewImpl* (*g_create_render_view_impl)(RenderViewImplParams*) =
-    NULL;
-
 static RenderViewImpl* FromRoutingID(int32 routing_id) {
   return static_cast<RenderViewImpl*>(
       ChildThread::current()->ResolveRoute(routing_id));
@@ -540,11 +536,22 @@ int64 ExtractPostId(const WebHistoryItem& item) {
 
 }  // namespace
 
-RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
-    : RenderWidget(WebKit::WebPopupTypeNone,
-                   params->screen_info,
-                   params->swapped_out),
-      webkit_preferences_(params->webkit_prefs),
+RenderViewImpl::RenderViewImpl(
+    int32 opener_id,
+    const RendererPreferences& renderer_prefs,
+    const WebPreferences& webkit_prefs,
+    SharedRenderViewCounter* counter,
+    int32 routing_id,
+    int32 surface_id,
+    int64 session_storage_namespace_id,
+    const string16& frame_name,
+    bool is_renderer_created,
+    bool swapped_out,
+    int32 next_page_id,
+    const WebKit::WebScreenInfo& screen_info,
+    AccessibilityMode accessibility_mode)
+    : RenderWidget(WebKit::WebPopupTypeNone, screen_info, swapped_out),
+      webkit_preferences_(webkit_prefs),
       send_content_state_immediately_(false),
       enabled_bindings_(0),
       send_preferred_size_changes_(false),
@@ -554,7 +561,7 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
       opener_suppressed_(false),
       page_id_(-1),
       last_page_id_sent_to_browser_(-1),
-      next_page_id_(params->next_page_id),
+      next_page_id_(next_page_id),
       history_list_offset_(-1),
       history_list_length_(0),
       target_url_status_(TARGET_NONE),
@@ -584,7 +591,7 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
       ALLOW_THIS_IN_INITIALIZER_LIST(
           load_progress_tracker_(new LoadProgressTracker(this))),
 #endif
-      session_storage_namespace_id_(params->session_storage_namespace_id),
+      session_storage_namespace_id_(session_storage_namespace_id),
       handling_select_range_(false),
 #if defined(OS_WIN)
       focused_plugin_id_(-1),
@@ -594,11 +601,11 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
       target_process_id_(0),
       target_routing_id_(0),
       ALLOW_THIS_IN_INITIALIZER_LIST(pepper_delegate_(this)) {
-  set_throttle_input_events(params->renderer_prefs.throttle_input_events);
-  routing_id_ = params->routing_id;
-  surface_id_ = params->surface_id;
-  if (params->opener_id != MSG_ROUTING_NONE && params->is_renderer_created)
-    opener_id_ = params->opener_id;
+  set_throttle_input_events(renderer_prefs.throttle_input_events);
+  routing_id_ = routing_id;
+  surface_id_ = surface_id;
+  if (opener_id != MSG_ROUTING_NONE && is_renderer_created)
+    opener_id_ = opener_id;
 
   // Ensure we start with a valid next_page_id_ from the browser.
   DCHECK_GE(next_page_id_, 0);
@@ -631,10 +638,10 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
       new EmailDetector()));
 #endif
 
-  if (params->counter) {
-    shared_popup_counter_ = params->counter;
+  if (counter) {
+    shared_popup_counter_ = counter;
     // Only count this if it isn't swapped out upon creation.
-    if (!params->swapped_out)
+    if (!swapped_out)
       shared_popup_counter_->data++;
     decrement_shared_popup_at_destruction_ = true;
   } else {
@@ -658,13 +665,13 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
   webview()->setDeviceScaleFactor(device_scale_factor_);
   webkit_preferences_.Apply(webview());
   webview()->initializeMainFrame(this);
-  if (!params->frame_name.empty())
-    webview()->mainFrame()->setName(params->frame_name);
+  if (!frame_name.empty())
+    webview()->mainFrame()->setName(frame_name);
   webview()->settings()->setMinimumTimerInterval(
       is_hidden() ? webkit_glue::kBackgroundTabTimerInterval :
           webkit_glue::kForegroundTabTimerInterval);
 
-  OnSetRendererPrefs(params->renderer_prefs);
+  OnSetRendererPrefs(renderer_prefs);
 
 #if defined(ENABLE_WEBRTC)
   if (!media_stream_dispatcher_)
@@ -688,7 +695,7 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
   intents_host_ = new WebIntentsHost(this);
 
   // Create renderer_accessibility_ if needed.
-  OnSetAccessibilityMode(params->accessibility_mode);
+  OnSetAccessibilityMode(accessibility_mode);
 
   new IdleUserDetector(this);
 
@@ -701,8 +708,8 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
 
   // If we have an opener_id but we weren't created by a renderer, then
   // it's the browser asking us to set our opener to another RenderView.
-  if (params->opener_id != MSG_ROUTING_NONE && !params->is_renderer_created) {
-    RenderViewImpl* opener_view = FromRoutingID(params->opener_id);
+  if (opener_id != MSG_ROUTING_NONE && !is_renderer_created) {
+    RenderViewImpl* opener_view = FromRoutingID(opener_id);
     if (opener_view)
       webview()->mainFrame()->setOpener(opener_view->webview()->mainFrame());
   }
@@ -786,7 +793,7 @@ RenderViewImpl* RenderViewImpl::Create(
     const WebKit::WebScreenInfo& screen_info,
     AccessibilityMode accessibility_mode) {
   DCHECK(routing_id != MSG_ROUTING_NONE);
-  RenderViewImplParams params(
+  return new RenderViewImpl(
       opener_id,
       renderer_prefs,
       webkit_prefs,
@@ -800,16 +807,6 @@ RenderViewImpl* RenderViewImpl::Create(
       next_page_id,
       screen_info,
       accessibility_mode);
-  if (g_create_render_view_impl)
-    return g_create_render_view_impl(&params);
-  return new RenderViewImpl(&params);
-}
-
-// static
-void RenderViewImpl::InstallCreateHook(
-    RenderViewImpl* (*create_render_view_impl)(RenderViewImplParams*)) {
-  CHECK(!g_create_render_view_impl);
-  g_create_render_view_impl = create_render_view_impl;
 }
 
 void RenderViewImpl::AddObserver(RenderViewObserver* observer) {
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 3e89bf6..468c268 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -163,7 +163,6 @@ class WebPluginDelegateProxy;
 class WebUIBindings;
 struct CustomContextMenuContext;
 struct FileChooserParams;
-struct RenderViewImplParams;
 
 #if defined(OS_ANDROID)
 class WebMediaPlayerProxyImplAndroid;
@@ -187,16 +186,15 @@ typedef base::RefCountedData<int> SharedRenderViewCounter;
 // RenderView is an object that manages a WebView object, and provides a
 // communication interface with an embedding application process
 //
-class CONTENT_EXPORT RenderViewImpl
-    : public RenderWidget,
-      public WebKit::WebViewClient,
-      public WebKit::WebFrameClient,
-      public WebKit::WebPageSerializerClient,
-      public RenderView,
-      public webkit::npapi::WebPluginPageDelegate,
-      public webkit_media::WebMediaPlayerDelegate,
-      public WebGraphicsContext3DSwapBuffersClient,
-      public base::SupportsWeakPtr<RenderViewImpl> {
+class RenderViewImpl : public RenderWidget,
+                       public WebKit::WebViewClient,
+                       public WebKit::WebFrameClient,
+                       public WebKit::WebPageSerializerClient,
+                       public RenderView,
+                       public webkit::npapi::WebPluginPageDelegate,
+                       public webkit_media::WebMediaPlayerDelegate,
+                       public WebGraphicsContext3DSwapBuffersClient,
+                       public base::SupportsWeakPtr<RenderViewImpl> {
  public:
   // Creates a new RenderView. If this is a blocked popup or as a new tab,
   // opener_id is the routing ID of the RenderView responsible for creating this
@@ -217,11 +215,6 @@ class CONTENT_EXPORT RenderViewImpl
       const WebKit::WebScreenInfo& screen_info,
       AccessibilityMode accessibility_mode);
 
-  // Used by content_layouttest_support to hook into the creation of
-  // RenderViewImpls.
-  static void InstallCreateHook(
-      RenderViewImpl* (*create_render_view_impl)(RenderViewImplParams*));
-
   // Returns the RenderViewImpl containing the given WebView.
   CONTENT_EXPORT static RenderViewImpl* FromWebView(WebKit::WebView* webview);
 
@@ -774,12 +767,6 @@ class CONTENT_EXPORT RenderViewImpl
   virtual bool CanComposeInline() OVERRIDE;
   virtual bool WebWidgetHandlesCompositorScheduling() const OVERRIDE;
 
- protected:
-  RenderViewImpl(RenderViewImplParams* params);
-
-  // Do not delete directly.  This class is reference counted.
-  virtual ~RenderViewImpl();
-
  private:
   // For unit tests.
   friend class ExternalPopupMenuTest;
@@ -827,6 +814,23 @@ class CONTENT_EXPORT RenderViewImpl
     CONNECTION_ERROR,
   };
 
+  RenderViewImpl(int32 opener_id,
+                 const RendererPreferences& renderer_prefs,
+                 const webkit_glue::WebPreferences& webkit_prefs,
+                 SharedRenderViewCounter* counter,
+                 int32 routing_id,
+                 int32 surface_id,
+                 int64 session_storage_namespace_id,
+                 const string16& frame_name,
+                 bool is_renderer_created,
+                 bool swapped_out,
+                 int32 next_page_id,
+                 const WebKit::WebScreenInfo& screen_info,
+                 AccessibilityMode accessibility_mode);
+
+  // Do not delete directly.  This class is reference counted.
+  virtual ~RenderViewImpl();
+
   void UpdateURL(WebKit::WebFrame* frame);
   void UpdateTitle(WebKit::WebFrame* frame, const string16& title,
                    WebKit::WebTextDirection title_direction);
diff --git a/content/renderer/render_view_impl_params.cc b/content/renderer/render_view_impl_params.cc
deleted file mode 100644
index 49ea830..0000000
--- a/content/renderer/render_view_impl_params.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2012 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 "content/renderer/render_view_impl_params.h"
-
-namespace content {
-
-RenderViewImplParams::RenderViewImplParams(
-    int32 opener_id,
-    const RendererPreferences& renderer_prefs,
-    const webkit_glue::WebPreferences& webkit_prefs,
-    SharedRenderViewCounter* counter,
-    int32 routing_id,
-    int32 surface_id,
-    int64 session_storage_namespace_id,
-    const string16& frame_name,
-    bool is_renderer_created,
-    bool swapped_out,
-    int32 next_page_id,
-    const WebKit::WebScreenInfo& screen_info,
-    AccessibilityMode accessibility_mode)
-    : opener_id(opener_id),
-      renderer_prefs(renderer_prefs),
-      webkit_prefs(webkit_prefs),
-      counter(counter),
-      routing_id(routing_id),
-      surface_id(surface_id),
-      session_storage_namespace_id(session_storage_namespace_id),
-      frame_name(frame_name),
-      is_renderer_created(is_renderer_created),
-      swapped_out(swapped_out),
-      next_page_id(next_page_id),
-      screen_info(screen_info),
-      accessibility_mode(accessibility_mode) {
-}
-
-RenderViewImplParams::~RenderViewImplParams() {}
-
-}  // namespace content
diff --git a/content/renderer/render_view_impl_params.h b/content/renderer/render_view_impl_params.h
deleted file mode 100644
index 19db5eb..0000000
--- a/content/renderer/render_view_impl_params.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) 2012 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.
-
-#ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_PARAMS_H_
-#define CONTENT_RENDERER_RENDER_VIEW_IMPL_PARAMS_H_
-
-#include "base/basictypes.h"
-#include "base/memory/ref_counted.h"
-#include "base/string16.h"
-#include "content/common/content_export.h"
-#include "content/common/view_message_enums.h"
-
-namespace WebKit {
-struct WebScreenInfo;
-}
-
-namespace webkit_glue {
-struct WebPreferences;
-}
-
-namespace content {
-
-struct RendererPreferences;
-typedef base::RefCountedData<int> SharedRenderViewCounter;
-
-// Container for all parameters passed to RenderViewImpl's constructor.
-struct CONTENT_EXPORT RenderViewImplParams {
-  RenderViewImplParams(int32 opener_id,
-                       const RendererPreferences& renderer_prefs,
-                       const webkit_glue::WebPreferences& webkit_prefs,
-                       SharedRenderViewCounter* counter,
-                       int32 routing_id,
-                       int32 surface_id,
-                       int64 session_storage_namespace_id,
-                       const string16& frame_name,
-                       bool is_renderer_created,
-                       bool swapped_out,
-                       int32 next_page_id,
-                       const WebKit::WebScreenInfo& screen_info,
-                       AccessibilityMode accessibility_mode);
-  ~RenderViewImplParams();
-
-  int32 opener_id;
-  const RendererPreferences& renderer_prefs;
-  const webkit_glue::WebPreferences& webkit_prefs;
-  SharedRenderViewCounter* counter;
-  int32 routing_id;
-  int32 surface_id;
-  int64 session_storage_namespace_id;
-  const string16& frame_name;
-  bool is_renderer_created;
-  bool swapped_out;
-  int32 next_page_id;
-  const WebKit::WebScreenInfo& screen_info;
-  AccessibilityMode accessibility_mode;
-};
-
-}  // namespace content
-
-#endif  // CONTENT_RENDERER_RENDER_VIEW_IMPL_PARAMS_H_
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();
diff --git a/content/test/DEPS b/content/test/DEPS
index ebd2714..3227a5e 100644
--- a/content/test/DEPS
+++ b/content/test/DEPS
@@ -4,5 +4,4 @@ include_rules = [
   "+media/base",  # For ChannelLayout in WebRTC tests.
   "+ui/aura/test/test_aura_initializer.h",
   "+ui/base/resource/data_pack.h",
-  "+third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public",
 ]
diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc
deleted file mode 100644
index ea70318..0000000
--- a/content/test/layouttest_support.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2012 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 "content/public/test/layouttest_support.h"
-
-#include "base/callback.h"
-#include "base/lazy_instance.h"
-#include "content/renderer/render_view_impl.h"
-#include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h"
-
-using WebTestRunner::WebTestProxy;
-using WebTestRunner::WebTestProxyBase;
-
-namespace content {
-
-namespace {
-
-base::LazyInstance<base::Callback<void(WebTestProxyBase*)> >::Leaky g_callback;
-
-RenderViewImpl* CreateWebTestProxy(RenderViewImplParams* params) {
-  typedef WebTestProxy<RenderViewImpl, RenderViewImplParams*> ProxyType;
-  ProxyType* render_view_proxy = new ProxyType(
-      reinterpret_cast<RenderViewImplParams*>(params));
-  if (g_callback == 0)
-    return render_view_proxy;
-  g_callback.Get().Run(render_view_proxy);
-  return render_view_proxy;
-}
-
-}  // namespace
-
-
-void EnableWebTestProxyCreation(
-    const base::Callback<void(WebTestProxyBase*)>& callback) {
-  g_callback.Get() = callback;
-  RenderViewImpl::InstallCreateHook(CreateWebTestProxy);
-}
-
-}  // namespace content