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

cc/delegated_renderer_layer_impl_unittest.cc

Index: cc/delegated_renderer_layer_impl_unittest.cc
===================================================================
--- cc/delegated_renderer_layer_impl_unittest.cc	(revision 165906)
+++ cc/delegated_renderer_layer_impl_unittest.cc	(working copy)
@@ -14,7 +14,6 @@
 #include "cc/single_thread_proxy.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/solid_color_layer_impl.h"
-#include "cc/test/fake_proxy.h"
 #include "cc/test/fake_web_compositor_output_surface.h"
 #include "cc/test/fake_web_graphics_context_3d.h"
 #include "cc/test/geometry_test_utils.h"
@@ -35,13 +34,11 @@
 class DelegatedRendererLayerImplTest : public testing::Test, public LayerTreeHostImplClient {
 public:
     DelegatedRendererLayerImplTest()
-        : m_proxy(scoped_ptr<Thread>(NULL))
-        , m_alwaysImplThreadAndMainThreadBlocked(&m_proxy)
     {
         LayerTreeSettings settings;
         settings.minimumOcclusionTrackingSize = gfx::Size();
 
-        m_hostImpl = LayerTreeHostImpl::create(settings, this, &m_proxy);
+        m_hostImpl = LayerTreeHostImpl::create(settings, this);
         m_hostImpl->initializeRenderer(createContext());
         m_hostImpl->setViewportSize(gfx::Size(10, 10), gfx::Size(10, 10));
     }
@@ -63,8 +60,9 @@
         return FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::WebGraphicsContext3D>(new FakeWebGraphicsContext3D)).PassAs<GraphicsContext>();
     }
 
-    FakeProxy m_proxy;
-    DebugScopedSetImplThreadAndMainThreadBlocked m_alwaysImplThreadAndMainThreadBlocked;
+    DebugScopedSetImplThread m_alwaysImplThread;
+    DebugScopedSetMainThreadBlocked m_alwaysMainThreadBlocked;
+
     scoped_ptr<LayerTreeHostImpl> m_hostImpl;
 };