Extract WebViewClient implementation out of WebTestProxyBase.

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"
@@ skipping 38 matching lines @@
 namespace {
 
 void WebTestProxyCreated(RenderView* render_view,
                          test_runner::WebTestProxyBase* proxy) {
   BlinkTestRunner* test_runner = new BlinkTestRunner(render_view);
   test_runner->set_proxy(proxy);
   if (!LayoutTestRenderProcessObserver::GetInstance()->test_delegate()) {
     LayoutTestRenderProcessObserver::GetInstance()->SetTestDelegate(
         test_runner);
   }
+  proxy->set_view_test_client(LayoutTestRenderProcessObserver::GetInstance()
+                                  ->test_interfaces()
+                                  ->CreateWebViewTestClient(proxy));
   proxy->SetInterfaces(
       LayoutTestRenderProcessObserver::GetInstance()->test_interfaces());
   test_runner->proxy()->SetDelegate(
       LayoutTestRenderProcessObserver::GetInstance()->test_delegate());
 }
 
 void WebFrameTestProxyCreated(RenderFrame* render_frame,
                               test_runner::WebFrameTestProxyBase* proxy) {
   proxy->set_test_client(LayoutTestRenderProcessObserver::GetInstance()
                              ->test_interfaces()
-                             ->GetWebFrameTestClient());
+                             ->CreateWebFrameTestClient());
 }
 
 }  // namespace
 
 LayoutTestContentRendererClient::LayoutTestContentRendererClient() {
   EnableWebTestProxyCreation(base::Bind(&WebTestProxyCreated),
                              base::Bind(&WebFrameTestProxyCreated));
 }
 
 LayoutTestContentRendererClient::~LayoutTestContentRendererClient() {
 }
 
 void LayoutTestContentRendererClient::RenderThreadStarted() {
   ShellContentRendererClient::RenderThreadStarted();
   shell_observer_.reset(new LayoutTestRenderProcessObserver());
 }
 
 void LayoutTestContentRendererClient::RenderFrameCreated(
     RenderFrame* render_frame) {
   new LayoutTestRenderFrameObserver(render_frame);
 }
 
 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());
   test_runner::WebTestDelegate* delegate =
       LayoutTestRenderProcessObserver::GetInstance()->test_delegate();
   if (delegate == static_cast<test_runner::WebTestDelegate*>(test_runner))
@@ skipping 64 matching lines @@
 LayoutTestContentRendererClient::CreateMediaStreamRendererFactory() {
 #if defined(ENABLE_WEBRTC)
   return scoped_ptr<MediaStreamRendererFactory>(
       new TestMediaStreamRendererFactory());
 #else
   return nullptr;
 #endif
 }
 
 }  // namespace content