Extract WebFrameClient implementation out of WebTestProxyBase.

content/public/test/layouttest_support.h

Index: content/public/test/layouttest_support.h
diff --git a/content/public/test/layouttest_support.h b/content/public/test/layouttest_support.h
index 402fd044e164636ad7dd7172cde84c949ca3e039..575177314c78400fc3523c8fa7de1d1aec8e99ad 100644
--- a/content/public/test/layouttest_support.h
+++ b/content/public/test/layouttest_support.h
@@ -32,6 +32,7 @@ class BluetoothAdapter;
 }
 
 namespace test_runner {
+class WebFrameTestProxyBase;
 class WebTestProxyBase;
 }
 
@@ -51,12 +52,17 @@ void EnableBrowserLayoutTestMode();
 // Turn a renderer into layout test mode.
 void EnableRendererLayoutTestMode();
 
-// Enable injecting of a WebTestProxy between WebViews and RenderViews.
-// |callback| is invoked with a pointer to WebTestProxyBase for each created
-// WebTestProxy.
+// 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*)>;
 void EnableWebTestProxyCreation(
-    const base::Callback<void(RenderView*, test_runner::WebTestProxyBase*)>&
-        callback);
+    const ViewProxyCreationCallback& view_proxy_creation_callback,
+    const FrameProxyCreationCallback& frame_proxy_creation_callback);
 
 typedef base::Callback<void(const blink::WebURLResponse& response,
                             const std::string& data)> FetchManifestCallback;