Moving remaining mocks from WebTestProxyBase into TestRunner.

content/shell/renderer/layout_test/layout_test_content_renderer_client.cc

 // Copyright (c) 2014 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/shell/renderer/layout_test/layout_test_content_renderer_client.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "components/test_runner/mock_credential_manager_client.h"
 #include "components/test_runner/web_frame_test_proxy.h"
 #include "components/test_runner/web_test_interfaces.h"
 #include "components/test_runner/web_test_proxy.h"
+#include "components/test_runner/web_test_runner.h"
 #include "components/web_cache/renderer/web_cache_render_process_observer.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/test/layouttest_support.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/renderer/layout_test/blink_test_helpers.h"
 #include "content/shell/renderer/layout_test/blink_test_runner.h"
 #include "content/shell/renderer/layout_test/layout_test_render_frame_observer.h"
 #include "content/shell/renderer/layout_test/layout_test_render_process_observer.h"
@@ skipping 71 matching lines @@
 void LayoutTestContentRendererClient::RenderViewCreated(
     RenderView* render_view) {
   new ShellRenderViewObserver(render_view);
 
   test_runner::WebTestProxyBase* proxy = GetWebTestProxyBase(render_view);
   proxy->set_web_widget(render_view->GetWebView());
   proxy->set_web_view(render_view->GetWebView());
 
   BlinkTestRunner* test_runner = BlinkTestRunner::Get(render_view);
   test_runner->Reset(false /* for_new_test */);
-  render_view->GetWebView()->setSpellCheckClient(
-      test_runner->proxy()->GetSpellCheckClient());
 
-  render_view->GetWebView()->setCredentialManagerClient(
-      test_runner->proxy()->GetCredentialManagerClientMock());
+  LayoutTestRenderProcessObserver::GetInstance()
+      ->test_interfaces()
+      ->TestRunner()
+      ->InitializeWebViewWithMocks(render_view->GetWebView());
+
   test_runner::WebTestDelegate* delegate =
       LayoutTestRenderProcessObserver::GetInstance()->test_delegate();
   if (delegate == static_cast<test_runner::WebTestDelegate*>(test_runner))
     LayoutTestRenderProcessObserver::GetInstance()->SetMainWindow(render_view);
 }
 
 WebMediaStreamCenter*
 LayoutTestContentRendererClient::OverrideCreateWebMediaStreamCenter(
     WebMediaStreamCenterClient* client) {
 #if defined(ENABLE_WEBRTC)
@@ skipping 57 matching lines @@
 LayoutTestContentRendererClient::CreateMediaStreamRendererFactory() {
 #if defined(ENABLE_WEBRTC)
   return scoped_ptr<MediaStreamRendererFactory>(
       new TestMediaStreamRendererFactory());
 #else
   return nullptr;
 #endif
 }
 
 }  // namespace content