Get rid of WebLayerTreeViewClient references in WebLayerTreeViewImplForTesting

Follow-up to r185341 / WebKit r144398

The only client this class needs is the DRTLayerTreeViewClient.

Review URL: https://codereview.chromium.org/12377029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185662 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 2 insertions, 22 deletions

diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc
index 54b8358..b1254a7 100644
--- a/webkit/support/test_webkit_platform_support.cc
+++ b/webkit/support/test_webkit_platform_support.cc
@@ -568,8 +568,7 @@ WebKit::WebLayerTreeView*
     TestWebKitPlatformSupport::createLayerTreeViewForTesting() {
   scoped_ptr<WebLayerTreeViewImplForTesting> view(
       new WebLayerTreeViewImplForTesting(
-          WebLayerTreeViewImplForTesting::FAKE_CONTEXT,
-          static_cast<WebKit::WebLayerTreeViewClient*>(NULL)));
+          WebLayerTreeViewImplForTesting::FAKE_CONTEXT, NULL));
 
   if (!view->initialize(scoped_ptr<cc::Thread>()))
     return NULL;
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index ef455d0..da6b4e6 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -523,10 +523,9 @@ WebKit::WebGraphicsContext3D* CreateGraphicsContext3D(
   return NULL;
 }
 
-template <typename Client>
 static WebKit::WebLayerTreeView* CreateLayerTreeView(
     WebKit::WebLayerTreeViewImplForTesting::RenderingType type,
-    Client* client) {
+    DRTLayerTreeViewClient* client) {
   scoped_ptr<WebKit::WebLayerTreeViewImplForTesting> view(
       new WebKit::WebLayerTreeViewImplForTesting(type, client));
 
@@ -544,18 +543,6 @@ static WebKit::WebLayerTreeView* CreateLayerTreeView(
 }
 
 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);
diff --git a/webkit/support/webkit_support.h b/webkit/support/webkit_support.h
index 03b1031..d8997905 100644
--- a/webkit/support/webkit_support.h
+++ b/webkit/support/webkit_support.h
@@ -29,7 +29,6 @@ class WebFileSystemCallbacks;
 class WebFrame;
 class WebGamepads;
 class WebLayerTreeView;
-class WebLayerTreeViewClient;
 class WebMediaPlayer;
 class WebMediaPlayerClient;
 class WebPlugin;
@@ -142,11 +141,6 @@ class DRTLayerTreeViewClient {
 };
 
 WebKit::WebLayerTreeView* CreateLayerTreeViewSoftware(
-    WebKit::WebLayerTreeViewClient* client);
-WebKit::WebLayerTreeView* CreateLayerTreeView3d(
-    WebKit::WebLayerTreeViewClient* client);
-
-WebKit::WebLayerTreeView* CreateLayerTreeViewSoftware(
     DRTLayerTreeViewClient* client);
 WebKit::WebLayerTreeView* CreateLayerTreeView3d(
     DRTLayerTreeViewClient* client);