Revert 171403

cc/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/prioritized_resource.h"
 
 #include "cc/prioritized_resource_manager.h"
 #include "cc/resource.h"
 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread
-#include "cc/test/fake_output_surface.h"
+#include "cc/test/fake_graphics_context.h"
 #include "cc/test/fake_proxy.h"
 #include "cc/test/tiled_layer_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace WebKitTests;
 
 namespace cc {
 
 class PrioritizedResourceTest : public testing::Test {
 public:
     PrioritizedResourceTest()
         : m_proxy(scoped_ptr<Thread>(NULL))
         , m_textureSize(256, 256)
         , m_textureFormat(GL_RGBA)
-        , m_outputSurface(createFakeOutputSurface())
+        , m_context(WebKit::createFakeGraphicsContext())
     {
         DebugScopedSetImplThread implThread(&m_proxy);
-        m_resourceProvider = ResourceProvider::create(m_outputSurface.get());
+        m_resourceProvider = ResourceProvider::create(m_context.get());
     }
 
     virtual ~PrioritizedResourceTest()
     {
         DebugScopedSetImplThread implThread(&m_proxy);
         m_resourceProvider.reset();
     }
 
     size_t texturesMemorySize(size_t textureCount)
     {
@@ skipping 52 matching lines @@
 
     size_t evictedBackingCount(PrioritizedResourceManager* resourceManager)
     {
         return resourceManager->m_evictedBackings.size();
     }
 
 protected:
     FakeProxy m_proxy;
     const gfx::Size m_textureSize;
     const GLenum m_textureFormat;
-    scoped_ptr<OutputSurface> m_outputSurface;
+    scoped_ptr<GraphicsContext> m_context;
     scoped_ptr<ResourceProvider> m_resourceProvider;
 };
 
 namespace {
 
 TEST_F(PrioritizedResourceTest, requestTextureExceedingMaxLimit)
 {
     const size_t maxTextures = 8;
     scoped_ptr<PrioritizedResourceManager> resourceManager = createManager(maxTextures);
 
@@ skipping 588 matching lines @@
         EXPECT_EQ(texturesMemorySize(3), resourceManager->memoryVisibleBytes());
         EXPECT_EQ(texturesMemorySize(4), resourceManager->memoryVisibleAndNearbyBytes());
     }
 
     DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked(&m_proxy);
     resourceManager->clearAllMemory(resourceProvider());
 }
 
 }  // namespace
 }  // namespace cc