Revert of Extract WebFrameClient implementation out of WebTestProxyBase.

content/public/test/layouttest_support.h

 // 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 <stddef.h>
 
 #include <string>
@@ skipping 14 matching lines @@
 struct WebSize;
 class WebView;
 class WebURLResponse;
 }
 
 namespace device {
 class BluetoothAdapter;
 }
 
 namespace test_runner {
-class WebFrameTestProxyBase;
 class WebTestProxyBase;
 }
 
 namespace content {
 
 class PageState;
 class RenderFrame;
 class RendererGamepadProvider;
 class RenderView;
 
 // Turn the browser process into layout test mode.
 void EnableBrowserLayoutTestMode();
 
 ///////////////////////////////////////////////////////////////////////////////
 // The following methods are meant to be used from a renderer.
 
 // Turn a renderer into layout test mode.
 void EnableRendererLayoutTestMode();
 
-// Enable injecting of a WebTestProxy between WebViews and RenderViews
-// and WebFrameTestProxy between WebFrames and RenderFrames.
-// |view_proxy_creation_callback| is invoked after creating WebTestProxy.
-// |frame_proxy_creation_callback| is called after creating WebFrameTestProxy.
-using ViewProxyCreationCallback =
-    base::Callback<void(RenderView*, test_runner::WebTestProxyBase*)>;
-using FrameProxyCreationCallback =
-    base::Callback<void(RenderFrame*, test_runner::WebFrameTestProxyBase*)>;
+// Enable injecting of a WebTestProxy between WebViews and RenderViews.
+// |callback| is invoked with a pointer to WebTestProxyBase for each created
+// WebTestProxy.
 void EnableWebTestProxyCreation(
-    const ViewProxyCreationCallback& view_proxy_creation_callback,
-    const FrameProxyCreationCallback& frame_proxy_creation_callback);
+    const base::Callback<void(RenderView*, test_runner::WebTestProxyBase*)>&
+        callback);
 
 typedef base::Callback<void(const blink::WebURLResponse& response,
                             const std::string& data)> FetchManifestCallback;
 void FetchManifest(blink::WebView* view, const GURL& url,
                    const FetchManifestCallback&);
 
 // Sets gamepad provider to be used for layout tests.
 void SetMockGamepadProvider(scoped_ptr<RendererGamepadProvider> provider);
 
 // Sets a double that should be used when registering
@@ skipping 58 matching lines @@
 void DisableAutoResizeMode(RenderView* render_view,
                            const blink::WebSize& new_size);
 
 // Provides a text dump of the contents of the given page state.
 std::string DumpBackForwardList(std::vector<PageState>& page_state,
                                 size_t current_index);
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_LAYOUTTEST_SUPPORT_H_