cc: Move WebCompositorOutputSurface and related classes into cc/

cc/layer_tree_host_impl.h

Index: cc/layer_tree_host_impl.h
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h
index 675d765fb8b9b4e792822752bdfb3573f2d70b7c..37befadcda122cebf74213fdff83b34b1164c501 100644
--- a/cc/layer_tree_host_impl.h
+++ b/cc/layer_tree_host_impl.h
@@ -12,13 +12,13 @@
 #include "cc/cc_export.h"
 #include "cc/input_handler.h"
 #include "cc/layer_sorter.h"
+#include "cc/output_surface_client.h"
 #include "cc/render_pass.h"
 #include "cc/render_pass_sink.h"
 #include "cc/renderer.h"
 #include "cc/tile_manager.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/rect.h"
-#include <public/WebCompositorOutputSurfaceClient.h>
 
 namespace cc {
 
@@ -113,7 +113,7 @@ private:
 class CC_EXPORT LayerTreeHostImpl : public InputHandlerClient,
                                     public RendererClient,
                                     public TileManagerClient,
-                                    public NON_EXPORTED_BASE(WebKit::WebCompositorOutputSurfaceClient) {
+                                    public OutputSurfaceClient {
     typedef std::vector<LayerImpl*> LayerList;
 
 public:
@@ -176,8 +176,9 @@ public:
     virtual void ScheduleManageTiles() OVERRIDE;
     virtual void ScheduleRedraw() OVERRIDE;
 
-    // WebCompositorOutputSurfaceClient implementation.
-    virtual void onVSyncParametersChanged(double monotonicTimebase, double intervalInSeconds) OVERRIDE;
+    // OutputSurfaceClient implementation.
+    virtual void OnVSyncParametersChanged(base::TimeTicks timebase, base::TimeDelta interval) OVERRIDE;
+    virtual void OnSendFrameToParentCompositorAck(const CompositorFrameAck&) OVERRIDE;
 
     // Implementation
     bool canDraw();