Revert of Extract WebFrameClient implementation out of WebTestProxyBase.

content/test/layouttest_support.cc

 // 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.
 
 #include "content/public/test/layouttest_support.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 41 matching lines @@
 using blink::WebDeviceOrientationData;
 using blink::WebGamepad;
 using blink::WebGamepads;
 using blink::WebRect;
 using blink::WebSize;
 
 namespace content {
 
 namespace {
 
-base::LazyInstance<ViewProxyCreationCallback>::Leaky
-    g_view_test_proxy_callback = LAZY_INSTANCE_INITIALIZER;
-
-base::LazyInstance<FrameProxyCreationCallback>::Leaky
-    g_frame_test_proxy_callback = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<
+    base::Callback<void(RenderView*, test_runner::WebTestProxyBase*)>>::Leaky
+    g_callback = LAZY_INSTANCE_INITIALIZER;
 
 RenderViewImpl* CreateWebTestProxy(CompositorDependencies* compositor_deps,
                                    const ViewMsg_New_Params& params) {
   typedef test_runner::WebTestProxy<RenderViewImpl, CompositorDependencies*,
                                     const ViewMsg_New_Params&> ProxyType;
   ProxyType* render_view_proxy = new ProxyType(compositor_deps, params);
-  if (g_view_test_proxy_callback == 0)
+  if (g_callback == 0)
     return render_view_proxy;
-  g_view_test_proxy_callback.Get().Run(render_view_proxy, render_view_proxy);
+  g_callback.Get().Run(render_view_proxy, render_view_proxy);
   return render_view_proxy;
 }
 
+test_runner::WebTestProxyBase* GetWebTestProxyBase(
+    RenderViewImpl* render_view) {
+  typedef test_runner::WebTestProxy<RenderViewImpl, const ViewMsg_New_Params&>
+      ViewProxy;
+
+  ViewProxy* render_view_proxy = static_cast<ViewProxy*>(render_view);
+  return static_cast<test_runner::WebTestProxyBase*>(render_view_proxy);
+}
+
 RenderFrameImpl* CreateWebFrameTestProxy(
     const RenderFrameImpl::CreateParams& params) {
   typedef test_runner::WebFrameTestProxy<
       RenderFrameImpl, const RenderFrameImpl::CreateParams&> FrameProxy;
 
   FrameProxy* render_frame_proxy = new FrameProxy(params);
-  if (g_frame_test_proxy_callback == 0)
-    return render_frame_proxy;
-  g_frame_test_proxy_callback.Get().Run(render_frame_proxy, render_frame_proxy);
+  render_frame_proxy->set_base_proxy(GetWebTestProxyBase(params.render_view));
+
   return render_frame_proxy;
 }
 
 #if defined(OS_WIN)
 // DirectWrite only has access to %WINDIR%\Fonts by default. For developer
 // side-loading, support kRegisterFontFiles to allow access to additional fonts.
 void RegisterSideloadedTypefaces(SkFontMgr* fontmgr) {
   std::vector<std::string> files = switches::GetSideloadFontFiles();
   for (std::vector<std::string>::const_iterator i(files.begin());
        i != files.end();
        ++i) {
     SkTypeface* typeface = fontmgr->createFromFile(i->c_str());
     if (!ShouldUseDirectWriteFontProxyFieldTrial())
       DoPreSandboxWarmupForTypeface(typeface);
     blink::WebFontRendering::addSideloadedFontForTesting(typeface);
   }
 }
 #endif  // OS_WIN
 
 }  // namespace
 
 void EnableWebTestProxyCreation(
-    const ViewProxyCreationCallback& view_proxy_creation_callback,
-    const FrameProxyCreationCallback& frame_proxy_creation_callback) {
-  g_view_test_proxy_callback.Get() = view_proxy_creation_callback;
-  g_frame_test_proxy_callback.Get() = frame_proxy_creation_callback;
+    const base::Callback<void(RenderView*, test_runner::WebTestProxyBase*)>&
+        callback) {
+  g_callback.Get() = callback;
   RenderViewImpl::InstallCreateHook(CreateWebTestProxy);
   RenderFrameImpl::InstallCreateHook(CreateWebFrameTestProxy);
 }
 
 void FetchManifestDoneCallback(
     scoped_ptr<ManifestFetcher> fetcher,
     const FetchManifestCallback& callback,
     const blink::WebURLResponse& response,
     const std::string& data) {
   // |fetcher| will be autodeleted here as it is going out of scope.
@@ skipping 321 matching lines @@
     result.append(
         DumpHistoryItem(entry->root_history_node(),
                         8,
                         index == current_index));
   }
   result.append("===============================================\n");
   return result;
 }
 
 }  // namespace content