| Index: cc/resource_update_controller_unittest.cc
|
| diff --git a/cc/resource_update_controller_unittest.cc b/cc/resource_update_controller_unittest.cc
|
| index fad3f26aa46fad51388a809658247c94c1bc19e6..4b324b64fc11dd9ea339112bd73923c4d3d5a591 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_context = FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::WebGraphicsContext3D>(new WebGraphicsContext3DForUploadTest(this)));
|
| + m_outputSurface = 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_context.get());
|
| + m_resourceProvider = ResourceProvider::create(m_outputSurface.get());
|
| }
|
|
|
|
|
| @@ -198,7 +198,7 @@ protected:
|
| protected:
|
| // Classes required to interact and test the ResourceUpdateController
|
| FakeProxy m_proxy;
|
| - scoped_ptr<GraphicsContext> m_context;
|
| + scoped_ptr<OutputSurface> m_outputSurface;
|
| scoped_ptr<ResourceProvider> m_resourceProvider;
|
| scoped_ptr<ResourceUpdateQueue> m_queue;
|
| scoped_ptr<PrioritizedResource> m_textures[4];
|
|
|