Use different client interface for WebLayerTreeViewForTesting to decouple from WebLayerTreeViewClie…

webkit/support/webkit_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 "webkit/support/webkit_support.h"
 
 #include "base/at_exit.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 502 matching lines @@
           new WebGraphicsContext3DInProcessCommandBufferImpl());
       if (!context->Initialize(attributes, NULL))
         return NULL;
       return context.release();
     }
   }
   NOTREACHED();
   return NULL;
 }
 
+template <typename Client>
 static WebKit::WebLayerTreeView* CreateLayerTreeView(
     WebKit::WebLayerTreeViewImplForTesting::RenderingType type,
-    WebKit::WebLayerTreeViewClient* client) {
+    Client* client) {
   scoped_ptr<WebKit::WebLayerTreeViewImplForTesting> view(
       new WebKit::WebLayerTreeViewImplForTesting(type, client));
 
   scoped_ptr<cc::Thread> compositor_thread;
 
   webkit::WebCompositorSupportImpl* compositor_support_impl =
       test_environment->webkit_platform_support()->compositor_support_impl();
   if (compositor_support_impl->compositor_thread_message_loop_proxy())
     compositor_thread = cc::ThreadImpl::createForDifferentThread(
         compositor_support_impl->compositor_thread_message_loop_proxy());
 
   if (!view->initialize(compositor_thread.Pass()))
     return NULL;
   return view.release();
 }
 
 WebKit::WebLayerTreeView* CreateLayerTreeViewSoftware(
     WebKit::WebLayerTreeViewClient* client) {
   return CreateLayerTreeView(
       WebKit::WebLayerTreeViewImplForTesting::SOFTWARE_CONTEXT, client);
 }
 
 WebKit::WebLayerTreeView* CreateLayerTreeView3d(
     WebKit::WebLayerTreeViewClient* client) {
   return CreateLayerTreeView(
       WebKit::WebLayerTreeViewImplForTesting::MESA_CONTEXT, client);
 }
 
+WebKit::WebLayerTreeView* CreateLayerTreeViewSoftware(
+    DRTLayerTreeViewClient* client) {
+  return CreateLayerTreeView(
+      WebKit::WebLayerTreeViewImplForTesting::SOFTWARE_CONTEXT, client);
+}
+
+WebKit::WebLayerTreeView* CreateLayerTreeView3d(
+    DRTLayerTreeViewClient* client) {
+  return CreateLayerTreeView(
+      WebKit::WebLayerTreeViewImplForTesting::MESA_CONTEXT, client);
+}
+
 void RegisterMockedURL(const WebKit::WebURL& url,
                      const WebKit::WebURLResponse& response,
                      const WebKit::WebString& file_path) {
   test_environment->webkit_platform_support()->url_loader_factory()->
       RegisterURL(url, response, file_path);
 }
 
 void RegisterMockedErrorURL(const WebKit::WebURL& url,
                             const WebKit::WebURLResponse& response,
                             const WebKit::WebURLError& error) {
@@ skipping 352 matching lines @@
 // Logging
 void EnableWebCoreLogChannels(const std::string& channels) {
   webkit_glue::EnableWebCoreLogChannels(channels);
 }
 
 void SetGamepadData(const WebKit::WebGamepads& pads) {
   test_environment->webkit_platform_support()->setGamepadData(pads);
 }
 
 }  // namespace webkit_support