cc: Move WebCompositorOutputSurface and related classes into cc/

cc/test/pixel_test_output_surface.cc

Index: cc/test/pixel_test_output_surface.cc
diff --git a/cc/test/pixel_test_output_surface.cc b/cc/test/pixel_test_output_surface.cc
index 46985b74208a68ed5ad67d976f4ac3ee25d0e4ea..a7e15423d522982b2f040e3bf194ebdfe05ea3f5 100644
--- a/cc/test/pixel_test_output_surface.cc
+++ b/cc/test/pixel_test_output_surface.cc
@@ -18,19 +18,22 @@ PixelTestOutputSurface::PixelTestOutputSurface() {
 PixelTestOutputSurface::~PixelTestOutputSurface() {
 }
 
-bool PixelTestOutputSurface::bindToClient(
-    WebKit::WebCompositorOutputSurfaceClient*) {
+bool PixelTestOutputSurface::BindToClient(OutputSurfaceClient*) {
   return context_->makeContextCurrent();
 }
 
-const WebKit::WebCompositorOutputSurface::Capabilities&
-    PixelTestOutputSurface::capabilities() const {
-  static WebKit::WebCompositorOutputSurface::Capabilities capabilities;
+const struct OutputSurface::Capabilities& PixelTestOutputSurface::Capabilities()
+    const {
+  static struct OutputSurface::Capabilities capabilities;
   return capabilities;
 }
 
-WebKit::WebGraphicsContext3D* PixelTestOutputSurface::context3D() const {
+WebKit::WebGraphicsContext3D* PixelTestOutputSurface::Context3D() const {
   return context_.get();
 }
 
+SoftwareOutputDevice* PixelTestOutputSurface::SoftwareDevice() const {
+  return NULL;
+}
+
 }  // namespace cc