Use correct WebTestDelegate from WebViewTestClient and 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 35 matching lines @@
 using blink::WebThemeEngine;
 
 namespace content {
 
 namespace {
 
 void WebTestProxyCreated(RenderView* render_view,
                          test_runner::WebTestProxyBase* proxy) {
   BlinkTestRunner* test_runner = new BlinkTestRunner(render_view);
   test_runner->set_proxy(proxy);
+  proxy->set_delegate(test_runner);
+
   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()
                              ->CreateWebFrameTestClient());
 }
 
 }  // namespace
@@ skipping 102 matching lines @@
 LayoutTestContentRendererClient::CreateMediaStreamRendererFactory() {
 #if defined(ENABLE_WEBRTC)
   return std::unique_ptr<MediaStreamRendererFactory>(
       new TestMediaStreamRendererFactory());
 #else
   return nullptr;
 #endif
 }
 
 }  // namespace content