Remove static thread pointers from CC

cc/single_thread_proxy.h

Index: cc/single_thread_proxy.h
diff --git a/cc/single_thread_proxy.h b/cc/single_thread_proxy.h
index 0d005b096a5fa0f69c54f880deb05dae56ba864f..f78041d8797df66f512b949c8df776d574492d00 100644
--- a/cc/single_thread_proxy.h
+++ b/cc/single_thread_proxy.h
@@ -89,42 +89,58 @@ private:
 // code is running on the impl thread to satisfy assertion checks.
 class DebugScopedSetImplThread {
 public:
-    DebugScopedSetImplThread()
+    DebugScopedSetImplThread(Proxy* proxy)
+        : m_proxy(proxy)
     {
 #ifndef NDEBUG
-        Proxy::setCurrentThreadIsImplThread(true);
+        m_previousValue = m_proxy->m_implThreadIsOverridden;
+        m_proxy->setCurrentThreadIsImplThread(true);
 #endif
     }
     ~DebugScopedSetImplThread()
     {
 #ifndef NDEBUG
-        Proxy::setCurrentThreadIsImplThread(false);
+        m_proxy->setCurrentThreadIsImplThread(m_previousValue);
 #endif
     }
+private:
+    bool m_previousValue;
+    Proxy* m_proxy;
 };
 
 // For use in the single-threaded case. In debug builds, it pretends that the
 // code is running on the main thread to satisfy assertion checks.
 class DebugScopedSetMainThread {
 public:
-    DebugScopedSetMainThread()
+    DebugScopedSetMainThread(Proxy* proxy)
+        : m_proxy(proxy)
     {
 #ifndef NDEBUG
-        Proxy::setCurrentThreadIsImplThread(false);
+        m_previousValue = m_proxy->m_implThreadIsOverridden;
+        m_proxy->setCurrentThreadIsImplThread(false);
 #endif
     }
     ~DebugScopedSetMainThread()
     {
 #ifndef NDEBUG
-        Proxy::setCurrentThreadIsImplThread(true);
+        m_proxy->setCurrentThreadIsImplThread(true);

[danakj, 2012/10/25 05:06:06]

set to m_previousValue?

 #endif
     }
+private:
+    bool m_previousValue;
+    Proxy* m_proxy;
 };
 
 // For use in the single-threaded case. In debug builds, it pretends that the
 // code is running on the impl thread and that the main thread is blocked to
 // satisfy assertion checks
 class DebugScopedSetImplThreadAndMainThreadBlocked {
+public:
+    DebugScopedSetImplThreadAndMainThreadBlocked(Proxy* proxy)
+        : m_implThread(proxy)
+        , m_mainThreadBlocked(proxy)
+    {
+    }
 private:
     DebugScopedSetImplThread m_implThread;
     DebugScopedSetMainThreadBlocked m_mainThreadBlocked;