cc: Route offscreen context creation for compositor to the browser.

cc/test/layer_tree_test_common.cc

Index: cc/test/layer_tree_test_common.cc
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index c7528fc2232322c815cf7bac34befeb0547dd263..8389c9f591a81d165628f4017f42e81d77224b79 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -29,6 +29,14 @@ using namespace WebKit;
 
 namespace cc {
 
+TestHooks::TestHooks()
+    : m_fakeClient(false,  // use_software_rendering
+                   false)  // use_delegating_renderer
+{
+}
+
+TestHooks::~TestHooks() { }
+
 bool TestHooks::prepareToDrawOnThread(cc::LayerTreeHostImpl*, LayerTreeHostImpl::FrameData&, bool)
 {
     return true;
@@ -44,6 +52,26 @@ scoped_ptr<OutputSurface> TestHooks::createOutputSurface()
     return createFakeOutputSurface();
 }
 
+WebKit::WebGraphicsContext3D* TestHooks::offscreenContext3dForMainThread()
+{
+    return m_fakeClient.offscreenContext3dForMainThread();
+}
+
+WebKit::WebGraphicsContext3D* TestHooks::offscreenContext3dForCompositorThread()
+{
+    return m_fakeClient.offscreenContext3dForCompositorThread();
+}
+
+GrContext* TestHooks::offscreenGrContextForMainThread()
+{
+    return m_fakeClient.offscreenGrContextForMainThread();
+}
+
+GrContext* TestHooks::offscreenGrContextForCompositorThread()
+{
+    return m_fakeClient.offscreenGrContextForCompositorThread();
+}
+
 scoped_ptr<MockLayerTreeHostImpl> MockLayerTreeHostImpl::create(TestHooks* testHooks, const LayerTreeSettings& settings, LayerTreeHostImplClient* client, Proxy* proxy)
 {
     return make_scoped_ptr(new MockLayerTreeHostImpl(testHooks, settings, client, proxy));
@@ -193,6 +221,31 @@ public:
         m_testHooks->didRecreateOutputSurface(succeeded);
     }
 
+    virtual void willRetryRecreateOutputSurface() OVERRIDE
+    {
+        m_testHooks->willRetryRecreateOutputSurface();
+    }
+
+    virtual WebKit::WebGraphicsContext3D* offscreenContext3dForMainThread() OVERRIDE
+    {
+        return m_testHooks->offscreenContext3dForMainThread();
+    }
+
+    virtual WebKit::WebGraphicsContext3D* offscreenContext3dForCompositorThread() OVERRIDE
+    {
+        return m_testHooks->offscreenContext3dForCompositorThread();
+    }
+
+    virtual GrContext* offscreenGrContextForMainThread() OVERRIDE
+    {
+        return m_testHooks->offscreenGrContextForMainThread();
+    }
+
+    virtual GrContext* offscreenGrContextForCompositorThread() OVERRIDE
+    {
+        return m_testHooks->offscreenGrContextForCompositorThread();
+    }
+
     virtual scoped_ptr<InputHandler> createInputHandler() OVERRIDE
     {
         return scoped_ptr<InputHandler>();
@@ -312,8 +365,6 @@ void ThreadedTest::doBeginTest()
     if (m_endWhenBeginReturns)
         realEndTest();
 
-    LayerTreeHost::setNeedsFilterContext(false);
-
     // Allow commits to happen once beginTest() has had a chance to post tasks
     // so that those tasks will happen before the first commit.
     if (m_layerTreeHost)