Revert 171403

cc/nine_patch_layer_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/nine_patch_layer.h"
 
 #include "cc/layer_tree_host.h"
 #include "cc/occlusion_tracker.h"
 #include "cc/overdraw_metrics.h"
 #include "cc/rendering_stats.h"
 #include "cc/resource_provider.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/resource_update_queue.h"
 #include "cc/texture_uploader.h"
+#include "cc/test/fake_graphics_context.h"
 #include "cc/test/fake_layer_tree_host_client.h"
-#include "cc/test/fake_output_surface.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/layer_tree_test_common.h"
 #include "SkBitmap.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::Mock;
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::AnyNumber;
@@ skipping 69 matching lines @@
     testLayer->update(queue, &occlusionTracker, stats);
     EXPECT_EQ(queue.fullUploadSize(), 1);
     EXPECT_EQ(queue.partialUploadSize(), 0);
     ResourceUpdate params = queue.takeFirstFullUpload();
     EXPECT_TRUE(params.texture != NULL);
 
     // Upload the texture.
     m_layerTreeHost->contentsTextureManager()->setMaxMemoryLimitBytes(1024 * 1024);
     m_layerTreeHost->contentsTextureManager()->prioritizeTextures();
 
-    scoped_ptr<OutputSurface> outputSurface;
+    scoped_ptr<GraphicsContext> context;
     scoped_ptr<ResourceProvider> resourceProvider;
     {
         DebugScopedSetImplThread implThread(proxy());
         DebugScopedSetMainThreadBlocked mainThreadBlocked(proxy());
-        outputSurface = createFakeOutputSurface();
-        resourceProvider = ResourceProvider::create(outputSurface.get());
+        context = WebKit::createFakeGraphicsContext();
+        resourceProvider = ResourceProvider::create(context.get());
         params.texture->acquireBackingTexture(resourceProvider.get());
         ASSERT_TRUE(params.texture->haveBackingTexture());
     }
 
     // Nothing changed, so no repeated upload.
     testLayer->setTexturePriorities(calculator);
     testLayer->update(queue, &occlusionTracker, stats);
     EXPECT_EQ(queue.fullUploadSize(), 0);
     EXPECT_EQ(queue.partialUploadSize(), 0);
 
@@ skipping 17 matching lines @@
     testLayer->update(queue2, &occlusionTracker, stats);
     EXPECT_EQ(queue2.fullUploadSize(), 1);
     EXPECT_EQ(queue2.partialUploadSize(), 0);
     params = queue2.takeFirstFullUpload();
     EXPECT_TRUE(params.texture != NULL);
     EXPECT_EQ(params.texture->resourceManager(), m_layerTreeHost->contentsTextureManager());
 }
 
 }  // namespace
 }  // namespace cc