cc: Create a LayerScrollClient interface and an adapter class in compositor_bindings.

cc/trees/layer_tree_host_unittest_scroll.cc

Index: cc/trees/layer_tree_host_unittest_scroll.cc
diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc
index 8582d8f55a42a4bab09fee2324ec8da816b696ff..199c35e77adcbb2d7d31a66d1a6fea8ec728f01f 100644
--- a/cc/trees/layer_tree_host_unittest_scroll.cc
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -8,12 +8,12 @@
 #include "cc/layers/content_layer.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
+#include "cc/layers/layer_scroll_client.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/layer_tree_test.h"
 #include "cc/trees/layer_tree_impl.h"
-#include "third_party/WebKit/public/platform/WebLayerScrollClient.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/vector2d_conversions.h"
@@ -222,9 +222,8 @@ class LayerTreeHostScrollTestFractionalScroll : public LayerTreeHostScrollTest {
 
 MULTI_THREAD_TEST_F(LayerTreeHostScrollTestFractionalScroll);
 
-class LayerTreeHostScrollTestCaseWithChild
-    : public LayerTreeHostScrollTest,
-      public WebKit::WebLayerScrollClient {
+class LayerTreeHostScrollTestCaseWithChild : public LayerTreeHostScrollTest,
+                                             public LayerScrollClient {
  public:
   LayerTreeHostScrollTestCaseWithChild()
       : initial_offset_(10, 20),
@@ -280,7 +279,7 @@ class LayerTreeHostScrollTestCaseWithChild
 
   virtual void BeginTest() OVERRIDE { PostSetNeedsCommitToMainThread(); }
 
-  virtual void didScroll() OVERRIDE {
+  virtual void DidScroll() OVERRIDE {
     final_scroll_offset_ = expected_scroll_layer_->scroll_offset();
   }
 
@@ -800,16 +799,16 @@ class LayerTreeHostScrollTestLayerStructureChange
   }
 
  protected:
-  class FakeWebLayerScrollClient : public WebKit::WebLayerScrollClient {
+  class FakeLayerScrollClient : public LayerScrollClient {
    public:
-    virtual void didScroll() OVERRIDE {
+    virtual void DidScroll() OVERRIDE {
       owner_->DidScroll(layer_);
     }
     LayerTreeHostScrollTestLayerStructureChange* owner_;
     Layer* layer_;
   };
 
-  Layer* CreateScrollLayer(Layer* parent, FakeWebLayerScrollClient* client) {
+  Layer* CreateScrollLayer(Layer* parent, FakeLayerScrollClient* client) {
     scoped_refptr<Layer> scroll_layer =
         ContentLayer::Create(&fake_content_layer_client_);
     scroll_layer->SetBounds(gfx::Size(110, 110));
@@ -825,9 +824,9 @@ class LayerTreeHostScrollTestLayerStructureChange
     return scroll_layer.get();
   }
 
-  FakeWebLayerScrollClient root_scroll_layer_client_;
-  FakeWebLayerScrollClient sibling_scroll_layer_client_;
-  FakeWebLayerScrollClient child_scroll_layer_client_;
+  FakeLayerScrollClient root_scroll_layer_client_;
+  FakeLayerScrollClient sibling_scroll_layer_client_;
+  FakeLayerScrollClient child_scroll_layer_client_;
 
   FakeContentLayerClient fake_content_layer_client_;