Changed SoftwareOutputDevice interface.

webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc

Index: webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc
index 3479acfa52476dfff4fd8a9b95e577059c7893ea..9300a9fb8ad2979f16c39c721ecc154d0fcbbe02 100644
--- a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc
@@ -13,6 +13,7 @@
 #include "cc/layer.h"
 #include "cc/layer_tree_host.h"
 #include "cc/output_surface.h"
+#include "cc/software_output_device.h"
 #include "cc/switches.h"
 #include "cc/thread.h"
 #include "cc/thread_impl.h"
@@ -25,7 +26,6 @@
 #include "third_party/WebKit/Source/Platform/chromium/public/WebRenderingStats.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "webkit/compositor_bindings/web_compositor_support_impl.h"
-#include "webkit/compositor_bindings/web_compositor_support_software_output_device.h"
 #include "webkit/compositor_bindings/web_layer_impl.h"
 #include "webkit/compositor_bindings/web_rendering_stats_impl.h"
 #include "webkit/compositor_bindings/web_to_ccinput_handler_adapter.h"
@@ -195,11 +195,9 @@ WebLayerTreeViewImplForTesting::createOutputSurface() {
       break;
     }
     case SOFTWARE_CONTEXT: {
-      using webkit::WebCompositorSupportSoftwareOutputDevice;
-      scoped_ptr<WebCompositorSupportSoftwareOutputDevice> software_device =
-          make_scoped_ptr(new WebCompositorSupportSoftwareOutputDevice);
-      surface.reset(new cc::OutputSurface(
-          software_device.PassAs<cc::SoftwareOutputDevice>()));
+      scoped_ptr<cc::SoftwareOutputDevice> software_device =
+          make_scoped_ptr(new cc::SoftwareOutputDevice);
+      surface.reset(new cc::OutputSurface(software_device.Pass()));
       break;
     }
     case MESA_CONTEXT: {