Revert of Pinch/Zoom Infrastructure & Plumbing CL

cc/animation/scrollbar_animation_controller_thinning_unittest.cc

 // 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.
 
 #include "cc/animation/scrollbar_animation_controller_thinning.h"
 
 #include "cc/layers/solid_color_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 ScrollbarAnimationControllerThinningTest : public testing::Test {
  public:
   ScrollbarAnimationControllerThinningTest() : host_impl_(&proxy_) {}
 
  protected:
   virtual void SetUp() {
-    scoped_ptr<LayerImpl> scroll_layer =
-        LayerImpl::Create(host_impl_.active_tree(), 1);
-    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());
-
+    scroll_layer_ = LayerImpl::Create(host_impl_.active_tree(), 1);
     const int kId = 2;
     const int kThumbThickness = 10;
     const bool kIsLeftSideVerticalScrollbar = false;
-    const bool kIsOverlayScrollbar = true;
     scrollbar_layer_ = SolidColorScrollbarLayerImpl::Create(
         host_impl_.active_tree(), kId, HORIZONTAL, kThumbThickness,
-        kIsLeftSideVerticalScrollbar, kIsOverlayScrollbar);
+        kIsLeftSideVerticalScrollbar);
 
-    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_ = ScrollbarAnimationControllerThinning::CreateForTest(
-        scroll_layer_ptr,
+        scroll_layer_.get(),
         base::TimeDelta::FromSeconds(2),
         base::TimeDelta::FromSeconds(3));
   }
 
   FakeImplProxy proxy_;
   FakeLayerTreeHostImpl host_impl_;
   scoped_ptr<ScrollbarAnimationControllerThinning> scrollbar_controller_;
-  scoped_ptr<LayerImpl> clip_layer_;
+  scoped_ptr<LayerImpl> scroll_layer_;
   scoped_ptr<SolidColorScrollbarLayerImpl> scrollbar_layer_;
 };
 
 // Check initialization of scrollbar.
 TEST_F(ScrollbarAnimationControllerThinningTest, Idle) {
   scrollbar_controller_->Animate(base::TimeTicks());
   EXPECT_FLOAT_EQ(0.7f, scrollbar_layer_->opacity());
   EXPECT_FLOAT_EQ(0.4f, scrollbar_layer_->thumb_thickness_scale_factor());
 }
 
@@ skipping 270 matching lines @@
 
   time += base::TimeDelta::FromSeconds(1);
   scrollbar_controller_->Animate(time);
   EXPECT_FLOAT_EQ(0.7f, scrollbar_layer_->opacity());
   // The thickness now gets big again.
   EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->thumb_thickness_scale_factor());
 }
 
 }  // namespace
 }  // namespace cc