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

cc/damage_tracker_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/damage_tracker.h"
 
 #include "cc/layer_impl.h"
 #include "cc/layer_sorter.h"
@@ skipping 147 matching lines @@
     scoped_ptr<LayerImpl> root = createTestTreeWithTwoSurfaces();
 
     // Setup includes going past the first frame which always damages everything, so
     // that we can actually perform specific tests.
     emulateDrawingOneFrame(root.get());
 
     return root.Pass();
 }
 
 class DamageTrackerTest : public testing::Test {
+private:
+    // For testing purposes, fake that we are on the impl thread.
+    DebugScopedSetImplThread setImplThread;
 };
 
 TEST_F(DamageTrackerTest, sanityCheckTestTreeWithOneSurface)
 {
     // Sanity check that the simple test tree will actually produce the expected render
     // surfaces and layer lists.
 
     scoped_ptr<LayerImpl> root = createAndSetUpTestTreeWithOneSurface();
 
     EXPECT_EQ(2u, root->renderSurface()->layerList().size());
@@ skipping 973 matching lines @@
     rootDamageRect = root->renderSurface()->damageTracker()->currentDamageRect();
     EXPECT_TRUE(rootDamageRect.IsEmpty());
 
     // Damage should remain empty even after one frame, since there's yet no new damage
     emulateDrawingOneFrame(root.get());
     rootDamageRect = root->renderSurface()->damageTracker()->currentDamageRect();
     EXPECT_TRUE(rootDamageRect.IsEmpty());
 }
 
 } // namespace