ContextProvider in OutputSurface

cc/resources/prioritized_resource_unittest.cc

Index: cc/resources/prioritized_resource_unittest.cc
diff --git a/cc/resources/prioritized_resource_unittest.cc b/cc/resources/prioritized_resource_unittest.cc
index 92ce9ff723967ac34e9c6d3981e90f102a296efd..91b1c2ec62e574fc1be3bb02e7b85cfcf1f141fc 100644
--- a/cc/resources/prioritized_resource_unittest.cc
+++ b/cc/resources/prioritized_resource_unittest.cc
@@ -7,6 +7,7 @@
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/resources/resource.h"
 #include "cc/test/fake_output_surface.h"
+#include "cc/test/fake_output_surface_client.h"
 #include "cc/test/fake_proxy.h"
 #include "cc/test/tiled_layer_test_common.h"
 #include "cc/trees/single_thread_proxy.h"  // For DebugScopedSetImplThread
@@ -19,8 +20,9 @@ class PrioritizedResourceTest : public testing::Test {
   PrioritizedResourceTest()
       : texture_size_(256, 256),
         texture_format_(GL_RGBA),
-        output_surface_(CreateFakeOutputSurface()) {
+        output_surface_(FakeOutputSurface::Create3d()) {
     DebugScopedSetImplThread impl_thread(&proxy_);
+    CHECK(output_surface_->BindToClient(&output_surface_client_));
     resource_provider_ = cc::ResourceProvider::Create(output_surface_.get(), 0);
   }
 
@@ -92,6 +94,7 @@ class PrioritizedResourceTest : public testing::Test {
   FakeProxy proxy_;
   const gfx::Size texture_size_;
   const GLenum texture_format_;
+  FakeOutputSurfaceClient output_surface_client_;
   scoped_ptr<OutputSurface> output_surface_;
   scoped_ptr<cc::ResourceProvider> resource_provider_;
 };