cc: Move WebCompositorOutputSurface and related classes into cc/

content/renderer/gpu/compositor_software_output_device_gl_adapter.h

Index: content/renderer/gpu/compositor_software_output_device_gl_adapter.h
diff --git a/content/renderer/gpu/compositor_software_output_device_gl_adapter.h b/content/renderer/gpu/compositor_software_output_device_gl_adapter.h
index 2073644e11f662deaa658a23be29fa2be8660bd4..5d77edc29b6abfa28350d50a953c1c89f7602e38 100644
--- a/content/renderer/gpu/compositor_software_output_device_gl_adapter.h
+++ b/content/renderer/gpu/compositor_software_output_device_gl_adapter.h
@@ -10,9 +10,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/non_thread_safe.h"
+#include "cc/software_output_device.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSoftwareOutputDevice.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "ui/gfx/size.h"
 
@@ -21,17 +21,17 @@ namespace content {
 // This class can be created only on the main thread, but then becomes pinned
 // to a fixed thread when bindToClient is called.
 class CompositorSoftwareOutputDeviceGLAdapter
-    : NON_EXPORTED_BASE(public WebKit::WebCompositorSoftwareOutputDevice),
+    : NON_EXPORTED_BASE(public cc::SoftwareOutputDevice),
       NON_EXPORTED_BASE(public base::NonThreadSafe) {
 public:
   CompositorSoftwareOutputDeviceGLAdapter(
       WebKit::WebGraphicsContext3D* context3d);
   virtual ~CompositorSoftwareOutputDeviceGLAdapter();
 
-  virtual WebKit::WebImage* lock(bool forWrite) OVERRIDE;
-  virtual void unlock() OVERRIDE;
-
-  virtual void didChangeViewportSize(WebKit::WebSize size) OVERRIDE;
+  // cc::SoftwareOutputDevice implementation
+  virtual WebKit::WebImage* Lock(bool forWrite) OVERRIDE;
+  virtual void Unlock() OVERRIDE;
+  virtual void DidChangeViewportSize(gfx::Size size) OVERRIDE;
 
 private:
   void Initialize();