Revert of Extract WebFrameClient 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"
-#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/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"
@@ skipping 17 matching lines @@
 using blink::WebMediaStreamCenter;
 using blink::WebMediaStreamCenterClient;
 using blink::WebPlugin;
 using blink::WebPluginParams;
 using blink::WebRTCPeerConnectionHandler;
 using blink::WebRTCPeerConnectionHandlerClient;
 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);
-  if (!LayoutTestRenderProcessObserver::GetInstance()->test_delegate()) {
-    LayoutTestRenderProcessObserver::GetInstance()->SetTestDelegate(
-        test_runner);
-  }
-  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());
-}
-
-}  // namespace
-
 LayoutTestContentRendererClient::LayoutTestContentRendererClient() {
-  EnableWebTestProxyCreation(base::Bind(&WebTestProxyCreated),
-                             base::Bind(&WebFrameTestProxyCreated));
+  EnableWebTestProxyCreation(
+      base::Bind(&LayoutTestContentRendererClient::WebTestProxyCreated,
+                 base::Unretained(this)));
 }
 
 LayoutTestContentRendererClient::~LayoutTestContentRendererClient() {
 }
 
 void LayoutTestContentRendererClient::RenderThreadStarted() {
   ShellContentRendererClient::RenderThreadStarted();
   shell_observer_.reset(new LayoutTestRenderProcessObserver());
 }
 
@@ skipping 82 matching lines @@
 scoped_ptr<MediaStreamRendererFactory>
 LayoutTestContentRendererClient::CreateMediaStreamRendererFactory() {
 #if defined(ENABLE_WEBRTC)
   return scoped_ptr<MediaStreamRendererFactory>(
       new TestMediaStreamRendererFactory());
 #else
   return nullptr;
 #endif
 }
 
+void LayoutTestContentRendererClient::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->SetInterfaces(
+      LayoutTestRenderProcessObserver::GetInstance()->test_interfaces());
+  test_runner->proxy()->SetDelegate(
+      LayoutTestRenderProcessObserver::GetInstance()->test_delegate());
+}
+
 }  // namespace content