Use different client interface for WebLayerTreeViewForTesting to decouple from WebLayerTreeViewClie…

webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h

 // Copyright 2013 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.
 
 #ifndef WEBKIT_COMPOSITOR_BINDINGS_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_
 #define WEBKIT_COMPOSITOR_BINDINGS_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/layer_tree_host_client.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"
 #include "webkit/compositor_bindings/webkit_compositor_bindings_export.h"
+#include "webkit/support/webkit_support.h"
 
 namespace cc {
 class LayerTreeHost;
 class Thread;
 }
 
 namespace WebKit {
 class WebLayer;
 class WebLayerTreeViewClient;
 class WebLayerTreeViewClientAdapter;
 
 class WebLayerTreeViewImplForTesting : public WebKit::WebLayerTreeView,
                                        public cc::LayerTreeHostClient {
  public:
   enum RenderingType {
     FAKE_CONTEXT,
     SOFTWARE_CONTEXT,
     MESA_CONTEXT
   };
   WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebLayerTreeViewImplForTesting(
       RenderingType type,
+      webkit_support::DRTLayerTreeViewClient* client);
+  WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebLayerTreeViewImplForTesting(
+      RenderingType type,
       WebKit::WebLayerTreeViewClient* client);
   virtual ~WebLayerTreeViewImplForTesting();
 
   WEBKIT_COMPOSITOR_BINDINGS_EXPORT bool initialize(
       scoped_ptr<cc::Thread> compositor_thread);
 
   // WebLayerTreeView implementation.
   virtual void setSurfaceReady();
   virtual void setRootLayer(const WebLayer&);
   virtual void clearRootLayer();
@@ skipping 39 matching lines @@
   virtual void didCommitAndDrawFrame() OVERRIDE;
   virtual void didCompleteSwapBuffers() OVERRIDE;
   virtual void scheduleComposite() OVERRIDE;
   virtual scoped_refptr<cc::ContextProvider>
   OffscreenContextProviderForMainThread() OVERRIDE;
   virtual scoped_refptr<cc::ContextProvider>
   OffscreenContextProviderForCompositorThread() OVERRIDE;
 
  private:
   RenderingType type_;
+  webkit_support::DRTLayerTreeViewClient* drt_client_;
   WebKit::WebLayerTreeViewClient* client_;
   scoped_ptr<cc::LayerTreeHost> layer_tree_host_;
 
   class MainThreadContextProvider;
   scoped_refptr<MainThreadContextProvider> contexts_main_thread_;
   class CompositorThreadContextProvider;
   scoped_refptr<CompositorThreadContextProvider> contexts_compositor_thread_;
 };
 
 }  // namespace Web_kit
 
 #endif  // WEBKIT_COMPOSITOR_BINDINGS_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_