Extract WebViewClient 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 46 matching lines @@
 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;
 
+using WebTestProxyType = test_runner::WebTestProxy<RenderViewImpl,
+                                                   CompositorDependencies*,
+                                                   const ViewMsg_New_Params&>;
+
 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);
+  WebTestProxyType* render_view_proxy =
+      new WebTestProxyType(compositor_deps, params);
   if (g_view_test_proxy_callback == 0)
     return render_view_proxy;
   g_view_test_proxy_callback.Get().Run(render_view_proxy, render_view_proxy);
   return render_view_proxy;
 }
 
 RenderFrameImpl* CreateWebFrameTestProxy(
     const RenderFrameImpl::CreateParams& params) {
   typedef test_runner::WebFrameTestProxy<
       RenderFrameImpl, const RenderFrameImpl::CreateParams&> FrameProxy;
@@ skipping 14 matching lines @@
        i != files.end();
        ++i) {
     SkTypeface* typeface = fontmgr->createFromFile(i->c_str());
     blink::WebFontRendering::addSideloadedFontForTesting(typeface);
   }
 }
 #endif  // OS_WIN
 
 }  // namespace
 
+test_runner::WebTestProxyBase* GetWebTestProxyBase(RenderView* render_view) {
+  WebTestProxyType* render_view_proxy =
+      static_cast<WebTestProxyType*>(render_view);
+  return static_cast<test_runner::WebTestProxyBase*>(render_view_proxy);
+}
+
 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;
   RenderViewImpl::InstallCreateHook(CreateWebTestProxy);
   RenderFrameImpl::InstallCreateHook(CreateWebFrameTestProxy);
 }
 
 void FetchManifestDoneCallback(
@@ skipping 323 matching lines @@
     result.append(
         DumpHistoryItem(entry->root_history_node(),
                         8,
                         index == current_index));
   }
   result.append("===============================================\n");
   return result;
 }
 
 }  // namespace content