Revert 171403

cc_unittests is failing. Looks like something conflicted with this.

> cc: Finish the rename from cc::GraphicsContext to cc::OutputSurface
> 
> It is far too confusing to deal with OutputSurface code when half the time it is
> called a GraphicsContext in correctly. Cleaning this up so I can think about the
> code properly as I upstream the Ubercomp CL.
> 
> NOTRY=true
> R=jamesr,piman
> BUG=146080
> 
> 
> Review URL: https://chromiumcodereview.appspot.com/11450019

TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/11439026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171406 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/cc/resource_update_controller_unittest.cc b/cc/resource_update_controller_unittest.cc
index 4b324b6..fad3f26 100644
--- a/cc/resource_update_controller_unittest.cc
+++ b/cc/resource_update_controller_unittest.cc
@@ -121,7 +121,7 @@ public:
 protected:
     virtual void SetUp()
     {
-        m_outputSurface = FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::WebGraphicsContext3D>(new WebGraphicsContext3DForUploadTest(this)));
+        m_context = FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::WebGraphicsContext3D>(new WebGraphicsContext3DForUploadTest(this)));
         m_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 300, 150);
         m_bitmap.allocPixels();
 
@@ -133,7 +133,7 @@ protected:
         }
         m_resourceManager->prioritizeTextures();
 
-        m_resourceProvider = ResourceProvider::create(m_outputSurface.get());
+        m_resourceProvider = ResourceProvider::create(m_context.get());
     }
 
 
@@ -198,7 +198,7 @@ protected:
 protected:
     // Classes required to interact and test the ResourceUpdateController
     FakeProxy m_proxy;
-    scoped_ptr<OutputSurface> m_outputSurface;
+    scoped_ptr<GraphicsContext> m_context;
     scoped_ptr<ResourceProvider> m_resourceProvider;
     scoped_ptr<ResourceUpdateQueue> m_queue;
     scoped_ptr<PrioritizedResource> m_textures[4];