Index: cc/software_renderer_unittest.cc |
diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc |
index 3d71a0e0c0d61aaf46d33ccf30873a543f287f4b..c3ef9e461ffa66d311984ed65a4dd8ad7ae70b65 100644 |
--- a/cc/software_renderer_unittest.cc |
+++ b/cc/software_renderer_unittest.cc |
@@ -8,10 +8,10 @@ |
#include "cc/quad_sink.h" |
#include "cc/render_pass.h" |
#include "cc/render_pass_draw_quad.h" |
+#include "cc/software_output_device.h" |
#include "cc/solid_color_draw_quad.h" |
#include "cc/test/animation_test_common.h" |
#include "cc/test/fake_output_surface.h" |
-#include "cc/test/fake_software_output_device.h" |
#include "cc/test/geometry_test_utils.h" |
#include "cc/test/render_pass_test_common.h" |
#include "cc/test/render_pass_test_utils.h" |
@@ -32,13 +32,11 @@ public: |
} |
void initializeRenderer() { |
- m_outputSurface = FakeOutputSurface::CreateSoftware(scoped_ptr<SoftwareOutputDevice>(new FakeSoftwareOutputDevice)); |
+ m_outputSurface = FakeOutputSurface::CreateSoftware(make_scoped_ptr(new SoftwareOutputDevice)); |
m_resourceProvider = ResourceProvider::create(m_outputSurface.get()); |
- m_renderer = SoftwareRenderer::create(this, resourceProvider(), softwareDevice()); |
+ m_renderer = SoftwareRenderer::create(this, m_outputSurface.get(), resourceProvider()); |
} |
- SoftwareOutputDevice* softwareDevice() const { return m_outputSurface->software_device(); } |
- FakeOutputSurface* outputSurface() const { return m_outputSurface.get(); } |
ResourceProvider* resourceProvider() const { return m_resourceProvider.get(); } |
SoftwareRenderer* renderer() const { return m_renderer.get(); } |
void setViewportSize(const gfx::Size& viewportSize) { m_viewportSize = viewportSize; } |