ContextProvider in OutputSurface

cc/resources/prioritized_resource_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/prioritized_resource.h"
 
 #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
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 
 class PrioritizedResourceTest : public testing::Test {
  public:
   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);
   }
 
   virtual ~PrioritizedResourceTest() {
     DebugScopedSetImplThread impl_thread(&proxy_);
     resource_provider_.reset();
   }
 
   size_t TexturesMemorySize(size_t texture_count) {
     return Resource::MemorySizeBytes(texture_size_, texture_format_) *
@@ skipping 51 matching lines @@
   }
 
   size_t EvictedBackingCount(PrioritizedResourceManager* resource_manager) {
     return resource_manager->evicted_backings_.size();
   }
 
  protected:
   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_;
 };
 
 namespace {
 
 TEST_F(PrioritizedResourceTest, RequestTextureExceedingMaxLimit) {
   const size_t kMaxTextures = 8;
   scoped_ptr<PrioritizedResourceManager> resource_manager =
       CreateManager(kMaxTextures);
@@ skipping 687 matching lines @@
               resource_manager->MemoryVisibleAndNearbyBytes());
   }
 
   DebugScopedSetImplThreadAndMainThreadBlocked
   impl_thread_and_main_thread_blocked(&proxy_);
   resource_manager->ClearAllMemory(ResourceProvider());
 }
 
 }  // namespace
 }  // namespace cc