Revert of Pinch/Zoom Infrastructure & Plumbing CL

cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc

 // Copyright 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 "cc/animation/scrollbar_animation_controller_linear_fade.h"
 
-#include "cc/layers/solid_color_scrollbar_layer_impl.h"
+#include "cc/layers/painted_scrollbar_layer_impl.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 class ScrollbarAnimationControllerLinearFadeTest : public testing::Test {
  public:
   ScrollbarAnimationControllerLinearFadeTest() : host_impl_(&proxy_) {}
 
  protected:
   virtual void SetUp() {
-    const int kThumbThickness = 10;
-    const bool kIsLeftSideVerticalScrollbar = false;
-    const bool kIsOverlayScrollbar = true;  // Allow opacity animations.
+    scroll_layer_ = LayerImpl::Create(host_impl_.active_tree(), 1);
+    scrollbar_layer_ = PaintedScrollbarLayerImpl::Create(
+        host_impl_.active_tree(), 2, HORIZONTAL);
 
-    scoped_ptr<LayerImpl> scroll_layer =
-        LayerImpl::Create(host_impl_.active_tree(), 1);
-    scrollbar_layer_ =
-        SolidColorScrollbarLayerImpl::Create(host_impl_.active_tree(),
-                                             2,
-                                             HORIZONTAL,
-                                             kThumbThickness,
-                                             kIsLeftSideVerticalScrollbar,
-                                             kIsOverlayScrollbar);
-    clip_layer_ = LayerImpl::Create(host_impl_.active_tree(), 3);
-    scroll_layer->SetScrollClipLayer(clip_layer_->id());
-    LayerImpl* scroll_layer_ptr = scroll_layer.get();
-    clip_layer_->AddChild(scroll_layer.Pass());
-
-    scrollbar_layer_->SetClipLayerById(clip_layer_->id());
-    scrollbar_layer_->SetScrollLayerById(scroll_layer_ptr->id());
-    clip_layer_->SetBounds(gfx::Size(100, 100));
-    scroll_layer_ptr->SetBounds(gfx::Size(50, 50));
+    scroll_layer_->SetMaxScrollOffset(gfx::Vector2d(50, 50));
+    scroll_layer_->SetBounds(gfx::Size(50, 50));
+    scroll_layer_->SetHorizontalScrollbarLayer(scrollbar_layer_.get());
 
     scrollbar_controller_ = ScrollbarAnimationControllerLinearFade::Create(
-        scroll_layer_ptr,
+        scroll_layer_.get(),
         base::TimeDelta::FromSeconds(2),
         base::TimeDelta::FromSeconds(3));
   }
 
   FakeImplProxy proxy_;
   FakeLayerTreeHostImpl host_impl_;
   scoped_ptr<ScrollbarAnimationControllerLinearFade> scrollbar_controller_;
-  scoped_ptr<LayerImpl> clip_layer_;
-  scoped_ptr<SolidColorScrollbarLayerImpl> scrollbar_layer_;
+  scoped_ptr<LayerImpl> scroll_layer_;
+  scoped_ptr<PaintedScrollbarLayerImpl> scrollbar_layer_;
 };
 
 TEST_F(ScrollbarAnimationControllerLinearFadeTest, HiddenInBegin) {
   scrollbar_controller_->Animate(base::TimeTicks());
   EXPECT_FLOAT_EQ(0.0f, scrollbar_layer_->opacity());
 }
 
 TEST_F(ScrollbarAnimationControllerLinearFadeTest,
        HiddenAfterNonScrollingGesture) {
   scrollbar_controller_->DidScrollGestureBegin();
@@ skipping 187 matching lines @@
   EXPECT_FLOAT_EQ(1, scrollbar_layer_->opacity());
 
   time += base::TimeDelta::FromSeconds(1);
   scrollbar_controller_->DidScrollGestureEnd(time);
   EXPECT_TRUE(scrollbar_controller_->IsAnimating());
   EXPECT_FLOAT_EQ(1, scrollbar_layer_->opacity());
 }
 
 }  // namespace
 }  // namespace cc