Fork cc::OutputSurface into cc::CompositorFrameSink.

ui/android/delegated_frame_host_android.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_ANDROID_DELEGATED_FRAME_HOST_ANDROID_H_
 #define UI_ANDROID_DELEGATED_FRAME_HOST_ANDROID_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 40 matching lines @@
   bool HasDelegatedContent() const;
 
   uint32_t GetSurfaceClientId() const;
 
   // Should only be called when the host has a content layer.
   void RequestCopyOfSurface(
       WindowAndroidCompositor* compositor,
       const gfx::Rect& src_subrect_in_pixel,
       cc::CopyOutputRequest::CopyOutputRequestCallback result_callback);
 
-  void OutputSurfaceChanged();
+  void CompositorFrameSinkChanged();
 
   void UpdateBackgroundColor(SkColor color);
 
   void UpdateContainerSizeinDIP(const gfx::Size& size_in_dip);
 
  private:
   // cc::SurfaceFactoryClient implementation.
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;
   void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
 
@@ skipping 27 matching lines @@
   scoped_refptr<cc::Layer> background_layer_;
 
   gfx::Size container_size_in_dip_;
 
   DISALLOW_COPY_AND_ASSIGN(DelegatedFrameHostAndroid);
 };
 
 }  // namespace ui
 
 #endif  // UI_ANDROID_DELEGATED_FRAME_HOST_ANDROID_H_