Remove static thread pointers from CC

cc/video_layer_impl.cc

Index: cc/video_layer_impl.cc
diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc
index a81e982864f8415cd25733c6120e6fd149c254ad..4aca9804185e6baebdda5fb4238a7ba9d8376730 100644
--- a/cc/video_layer_impl.cc
+++ b/cc/video_layer_impl.cc
@@ -21,8 +21,9 @@
 
 namespace cc {
 
-CCVideoLayerImpl::CCVideoLayerImpl(int id, WebKit::WebVideoFrameProvider* provider)
+CCVideoLayerImpl::CCVideoLayerImpl(int id, WebKit::WebVideoFrameProvider* provider, CCProxy* proxy)
     : CCLayerImpl(id)
+    , m_proxy(proxy)
     , m_provider(provider)
     , m_frame(0)
     , m_externalTextureResource(0)
@@ -38,14 +39,14 @@ CCVideoLayerImpl::CCVideoLayerImpl(int id, WebKit::WebVideoFrameProvider* provid
     // thread is blocked. That makes this a thread-safe call to set the video
     // frame provider client that does not require a lock. The same is true of
     // the call in the destructor.
-    DCHECK(CCProxy::isMainThreadBlocked());
+    DCHECK(m_proxy->isMainThreadBlocked());
     m_provider->setVideoFrameProviderClient(this);
 }
 
 CCVideoLayerImpl::~CCVideoLayerImpl()
 {
     // See comment in constructor for why this doesn't need a lock.
-    DCHECK(CCProxy::isMainThreadBlocked());
+    DCHECK(m_proxy->isMainThreadBlocked());
     if (m_provider) {
         m_provider->setVideoFrameProviderClient(0);
         m_provider = 0;
@@ -88,7 +89,7 @@ static GLenum convertVFCFormatToGC3DFormat(const WebKit::WebVideoFrame& frame)
 
 void CCVideoLayerImpl::willDraw(CCResourceProvider* resourceProvider)
 {
-    DCHECK(CCProxy::isImplThread());
+    DCHECK(m_proxy->isImplThread());
     CCLayerImpl::willDraw(resourceProvider);
 
     // Explicitly acquire and release the provider mutex so it can be held from
@@ -109,7 +110,7 @@ void CCVideoLayerImpl::willDraw(CCResourceProvider* resourceProvider)
 
 void CCVideoLayerImpl::willDrawInternal(CCResourceProvider* resourceProvider)
 {
-    DCHECK(CCProxy::isImplThread());
+    DCHECK(m_proxy->isImplThread());
     DCHECK(!m_externalTextureResource);
 
     if (!m_provider) {
@@ -154,7 +155,7 @@ void CCVideoLayerImpl::willDrawInternal(CCResourceProvider* resourceProvider)
 
 void CCVideoLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuadsData)
 {
-    DCHECK(CCProxy::isImplThread());
+    DCHECK(m_proxy->isImplThread());
 
     if (!m_frame)
         return;
@@ -217,7 +218,7 @@ void CCVideoLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appe
 
 void CCVideoLayerImpl::didDraw(CCResourceProvider* resourceProvider)
 {
-    DCHECK(CCProxy::isImplThread());
+    DCHECK(m_proxy->isImplThread());
     CCLayerImpl::didDraw(resourceProvider);
 
     if (!m_frame)