Remove static thread pointers from CC

cc/nine_patch_layer_unittest.cc

Index: cc/nine_patch_layer_unittest.cc
diff --git a/cc/nine_patch_layer_unittest.cc b/cc/nine_patch_layer_unittest.cc
index 926c53a5c497cab7c284b81c5fb3ea2a9a80f320..3958b9299f4d91f5aae9759a994778b1b36721fd 100644
--- a/cc/nine_patch_layer_unittest.cc
+++ b/cc/nine_patch_layer_unittest.cc
@@ -35,7 +35,7 @@ public:
     MockLayerTreeHost()
         : LayerTreeHost(&m_fakeClient, LayerTreeSettings())
     {
-        initialize();
+        initialize(scoped_ptr<Thread>(NULL));
     }
 
 private:
@@ -49,6 +49,8 @@ public:
     {
     }
 
+    Proxy* proxy() const { return m_layerTreeHost->proxy(); }
+
 protected:
     virtual void SetUp()
     {
@@ -106,8 +108,8 @@ TEST_F(NinePatchLayerTest, triggerFullUploadOnceWhenChangingBitmap)
     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());
@@ -121,8 +123,8 @@ TEST_F(NinePatchLayerTest, triggerFullUploadOnceWhenChangingBitmap)
     EXPECT_EQ(queue.partialUploadSize(), 0);
 
     {
-        DebugScopedSetImplThread implThread;
-        DebugScopedSetMainThreadBlocked mainThreadBlocked;
+        DebugScopedSetImplThread implThread(proxy());
+        DebugScopedSetMainThreadBlocked mainThreadBlocked(proxy());
         m_layerTreeHost->contentsTextureManager()->clearAllMemory(resourceProvider.get());
     }