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

cc/layer_impl_unittest.cc

 // Copyright 2011 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/layer_impl.h"
 
 #include "cc/single_thread_proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 40 matching lines @@
     EXPECT_FALSE(grandChild->layerPropertyChanged());                   \
     EXPECT_TRUE(root->layerSurfacePropertyChanged())
 
 TEST(LayerImplTest, verifyLayerChangesAreTrackedProperly)
 {
     //
     // This test checks that layerPropertyChanged() has the correct behavior.
     //
 
     // The constructor on this will fake that we are on the correct thread.
+    DebugScopedSetImplThread setImplThread;
+
     // Create a simple LayerImpl tree:
     scoped_ptr<LayerImpl> root = LayerImpl::create(1);
     root->addChild(LayerImpl::create(2));
     LayerImpl* child = root->children()[0];
     child->addChild(LayerImpl::create(3));
     LayerImpl* grandChild = child->children()[0];
 
     // Adding children is an internal operation and should not mark layers as changed.
     EXPECT_FALSE(root->layerPropertyChanged());
     EXPECT_FALSE(child->layerPropertyChanged());
@@ skipping 84 matching lines @@
     EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setContentsOpaque(true));
     EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setOpacity(arbitraryNumber));
     EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setDebugBorderColor(arbitraryColor));
     EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setDebugBorderWidth(arbitraryNumber));
     EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setDrawsContent(true));
     EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setSublayerTransform(arbitraryTransform));
     EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setBounds(arbitrarySize));
 }
 
 } // namespace