Fork cc::OutputSurface into cc::CompositorFrameSink.

content/renderer/android/synchronous_compositor_registry.h

Index: content/renderer/android/synchronous_compositor_registry.h
diff --git a/content/renderer/android/synchronous_compositor_registry.h b/content/renderer/android/synchronous_compositor_registry.h
index 11ba68bd656b914e0b072d0c4ad5dd3339973fb2..52995bc64764b7e203387a64433f83f4fe55eb13 100644
--- a/content/renderer/android/synchronous_compositor_registry.h
+++ b/content/renderer/android/synchronous_compositor_registry.h
@@ -7,17 +7,16 @@
 
 
 namespace content {
-
-class SynchronousCompositorOutputSurface;
+class SynchronousCompositorFrameSink;
 
 class SynchronousCompositorRegistry {
  public:
-  virtual void RegisterOutputSurface(
+  virtual void RegisterCompositorFrameSink(
       int routing_id,
-      SynchronousCompositorOutputSurface* output_surface) = 0;
-  virtual void UnregisterOutputSurface(
+      SynchronousCompositorFrameSink* compositor_frame_sink) = 0;
+  virtual void UnregisterCompositorFrameSink(
       int routing_id,
-      SynchronousCompositorOutputSurface* output_surface) = 0;
+      SynchronousCompositorFrameSink* compositor_frame_sink) = 0;
 
  protected:
   virtual ~SynchronousCompositorRegistry() {}