Revert of [android] Make RWHVAndroid a BeginFrameObserver.

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 14 matching lines @@
 
 }  // namespace cc
 
 namespace ui {
 class ViewAndroid;
 class WindowAndroidCompositor;
 
 class UI_ANDROID_EXPORT DelegatedFrameHostAndroid
     : public cc::SurfaceFactoryClient {
  public:
-  class Client {
-   public:
-    virtual void SetBeginFrameSource(
-        cc::BeginFrameSource* begin_frame_source) = 0;
-    virtual void ReturnResources(const cc::ReturnedResourceArray&) = 0;
-  };
+  using ReturnResourcesCallback =
+      base::Callback<void(const cc::ReturnedResourceArray&)>;
 
   DelegatedFrameHostAndroid(ViewAndroid* view,
                             SkColor background_color,
-                            Client* client);
+                            ReturnResourcesCallback return_resources_callback);
 
   ~DelegatedFrameHostAndroid() override;
 
   void SubmitCompositorFrame(cc::CompositorFrame frame,
                              cc::SurfaceFactory::DrawCallback draw_callback);
 
   void DestroyDelegatedContent();
 
   bool HasDelegatedContent() const;
 
@@ skipping 23 matching lines @@
 
   void UpdateBackgroundLayer();
 
   const cc::FrameSinkId frame_sink_id_;
 
   ViewAndroid* view_;
 
   cc::SurfaceManager* surface_manager_;
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
   cc::FrameSinkId registered_parent_frame_sink_id_;
-  Client* client_;
+  ReturnResourcesCallback return_resources_callback_;
 
   std::unique_ptr<cc::SurfaceFactory> surface_factory_;
 
   struct FrameData {
     FrameData();
     ~FrameData();
 
     cc::LocalFrameId local_frame_id;
     gfx::Size surface_size;
     float top_controls_height;
@@ skipping 10 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_