Remove static thread pointers from CC

cc/nine_patch_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/nine_patch_layer.h"
 
 #include "cc/layer_tree_host.h"
 #include "cc/occlusion_tracker.h"
@@ skipping 17 matching lines @@
 using ::testing::AtLeast;
 using ::testing::AnyNumber;
 
 namespace {
 
 class MockLayerTreeHost : public LayerTreeHost {
 public:
     MockLayerTreeHost()
         : LayerTreeHost(&m_fakeClient, LayerTreeSettings())
     {
-        initialize();
+        initialize(scoped_ptr<Thread>(NULL));
     }
 
 private:
     FakeLayerImplTreeHostClient m_fakeClient;
 };
 
 
 class NinePatchLayerTest : public testing::Test {
 public:
     NinePatchLayerTest()
     {
     }
 
+    Proxy* proxy() const { return m_layerTreeHost->proxy(); }
+
 protected:
     virtual void SetUp()
     {
         m_layerTreeHost.reset(new MockLayerTreeHost);
     }
 
     virtual void TearDown()
     {
         Mock::VerifyAndClearExpectations(m_layerTreeHost.get());
     }
@@ skipping 37 matching lines @@
     ResourceUpdate params = queue.takeFirstFullUpload();
     EXPECT_TRUE(params.texture != NULL);
 
     // Upload the texture.
     m_layerTreeHost->contentsTextureManager()->setMaxMemoryLimitBytes(1024 * 1024);
     m_layerTreeHost->contentsTextureManager()->prioritizeTextures();
 
     scoped_ptr<GraphicsContext> context;
     scoped_ptr<ResourceProvider> resourceProvider;
     {
-        DebugScopedSetImplThread implThread;
-        DebugScopedSetMainThreadBlocked mainThreadBlocked;
+        DebugScopedSetImplThread implThread(proxy());
+        DebugScopedSetMainThreadBlocked mainThreadBlocked(proxy());
         context = WebKit::createFakeGraphicsContext();
         resourceProvider = ResourceProvider::create(context.get());
         params.texture->acquireBackingTexture(resourceProvider.get());
         ASSERT_TRUE(params.texture->haveBackingTexture());
     }
 
     // Nothing changed, so no repeated upload.
     testLayer->setTexturePriorities(calculator);
     testLayer->update(queue, &occlusionTracker, stats);
     EXPECT_EQ(queue.fullUploadSize(), 0);
     EXPECT_EQ(queue.partialUploadSize(), 0);
 
     {
-        DebugScopedSetImplThread implThread;
-        DebugScopedSetMainThreadBlocked mainThreadBlocked;
+        DebugScopedSetImplThread implThread(proxy());
+        DebugScopedSetMainThreadBlocked mainThreadBlocked(proxy());
         m_layerTreeHost->contentsTextureManager()->clearAllMemory(resourceProvider.get());
     }
 
     // Reupload after eviction
     testLayer->setTexturePriorities(calculator);
     testLayer->update(queue, &occlusionTracker, stats);
     EXPECT_EQ(queue.fullUploadSize(), 1);
     EXPECT_EQ(queue.partialUploadSize(), 0);
 }
 
 } // anonymous namespace