A speculative Revert for r165872 - Remove static thread pointers from CC, attempt 2

cc/scrollbar_layer_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 "config.h"
 
 #include "cc/scrollbar_layer.h"
 
 #include "cc/scrollbar_animation_controller.h"
 #include "cc/scrollbar_layer_impl.h"
@@ skipping 27 matching lines @@
     virtual ScrollbarControlSize controlSize() const OVERRIDE { return WebScrollbar::RegularScrollbar; }
     virtual ScrollbarPart pressedPart() const OVERRIDE { return WebScrollbar::NoPart; }
     virtual ScrollbarPart hoveredPart() const OVERRIDE { return WebScrollbar::NoPart; }
     virtual ScrollbarOverlayStyle scrollbarOverlayStyle() const OVERRIDE { return WebScrollbar::ScrollbarOverlayStyleDefault; }
     virtual bool isCustomScrollbar() const OVERRIDE { return false; }
     virtual Orientation orientation() const OVERRIDE { return WebScrollbar::Horizontal; }
 };
 
 TEST(ScrollbarLayerTest, resolveScrollLayerPointer)
 {
+    DebugScopedSetImplThread impl;
+
     WebKit::WebScrollbarThemePainter painter;
 
     {
         scoped_ptr<WebKit::WebScrollbar> scrollbar(FakeWebScrollbar::create());
         scoped_refptr<Layer> layerTreeRoot = Layer::create();
         scoped_refptr<Layer> child1 = Layer::create();
         scoped_refptr<Layer> child2 = ScrollbarLayer::create(scrollbar.Pass(), painter, WebKit::FakeWebScrollbarThemeGeometry::create(), child1->id());
         layerTreeRoot->addChild(child1);
         layerTreeRoot->addChild(child2);
 
@@ skipping 19 matching lines @@
         ScrollbarLayerImpl* ccChild1 = static_cast<ScrollbarLayerImpl*>(layerImplTreeRoot->children()[0]);
         LayerImpl* ccChild2 = layerImplTreeRoot->children()[1];
 
         EXPECT_TRUE(ccChild2->scrollbarAnimationController());
         EXPECT_EQ(ccChild2->horizontalScrollbarLayer(), ccChild1);
     }
 }
 
 TEST(ScrollbarLayerTest, scrollOffsetSynchronization)
 {
+    DebugScopedSetImplThread impl;
+
     WebKit::WebScrollbarThemePainter painter;
 
     scoped_ptr<WebKit::WebScrollbar> scrollbar(FakeWebScrollbar::create());
     scoped_refptr<Layer> layerTreeRoot = Layer::create();
     scoped_refptr<Layer> contentLayer = Layer::create();
     scoped_refptr<Layer> scrollbarLayer = ScrollbarLayer::create(scrollbar.Pass(), painter, WebKit::FakeWebScrollbarThemeGeometry::create(), layerTreeRoot->id());
     layerTreeRoot->addChild(contentLayer);
     layerTreeRoot->addChild(scrollbarLayer);
 
     layerTreeRoot->setScrollPosition(IntPoint(10, 20));
@@ skipping 21 matching lines @@
     EXPECT_EQ(300, ccScrollbarLayer->maximum());
 
     layerImplTreeRoot->scrollBy(FloatSize(12, 34));
 
     EXPECT_EQ(112, ccScrollbarLayer->currentPos());
     EXPECT_EQ(1000, ccScrollbarLayer->totalSize());
     EXPECT_EQ(300, ccScrollbarLayer->maximum());
 }
 
 }