Index: cc/delegated_renderer_layer_impl_unittest.cc |
diff --git a/cc/delegated_renderer_layer_impl_unittest.cc b/cc/delegated_renderer_layer_impl_unittest.cc |
index 716bf1f2cc89e86715b8719ebee43a06e87918a9..802453bcb540eba8cc50cf5336ff0d49fe03db09 100644 |
--- a/cc/delegated_renderer_layer_impl_unittest.cc |
+++ b/cc/delegated_renderer_layer_impl_unittest.cc |
@@ -14,6 +14,7 @@ |
#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" |
@@ -34,11 +35,13 @@ namespace { |
class DelegatedRendererLayerImplTest : public testing::Test, public LayerTreeHostImplClient { |
public: |
DelegatedRendererLayerImplTest() |
+ : m_proxy(0) |
+ , m_alwaysImplThreadAndMainThreadBlocked(&m_proxy) |
{ |
LayerTreeSettings settings; |
settings.minimumOcclusionTrackingSize = IntSize(); |
- m_hostImpl = LayerTreeHostImpl::create(settings, this); |
+ m_hostImpl = LayerTreeHostImpl::create(settings, this, &m_proxy); |
m_hostImpl->initializeRenderer(createContext()); |
m_hostImpl->setViewportSize(IntSize(10, 10), IntSize(10, 10)); |
} |
@@ -60,9 +63,8 @@ protected: |
return FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::WebGraphicsContext3D>(new FakeWebGraphicsContext3D)).PassAs<GraphicsContext>(); |
} |
- DebugScopedSetImplThread m_alwaysImplThread; |
- DebugScopedSetMainThreadBlocked m_alwaysMainThreadBlocked; |
- |
+ FakeProxy m_proxy; |
+ DebugScopedSetImplThreadAndMainThreadBlocked m_alwaysImplThreadAndMainThreadBlocked; |
scoped_ptr<LayerTreeHostImpl> m_hostImpl; |
}; |