Revert of [Android] Consolidate vsync request logic in RWHVAndroid

content/browser/renderer_host/render_widget_host_view_android.h

Index: content/browser/renderer_host/render_widget_host_view_android.h
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
index 6041afc03502f32298f04d076942a58db53c35b3..cd502d162ee328dd34ced8427a99d01d2d23f580 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -332,15 +332,6 @@
   void InternalSwapCompositorFrame(uint32 output_surface_id,
                                    scoped_ptr<cc::CompositorFrame> frame);
 
-  enum VSyncRequestType {
-    FLUSH_INPUT = 1 << 0,
-    BEGIN_FRAME = 1 << 1,
-    PERSISTENT_BEGIN_FRAME = 1 << 2
-  };
-  void RequestVSyncUpdate(uint32 requests);
-  void StartObservingRootWindow();
-  void StopObservingRootWindow();
-  void SendBeginFrame(base::TimeTicks frame_time, base::TimeDelta vsync_period);
   bool Animate(base::TimeTicks frame_time);
 
   void OnContentScrollingChange();
@@ -354,8 +345,8 @@
   // The model object.
   RenderWidgetHostImpl* host_;
 
-  // Used to control action dispatch at the next |OnVSync()| call.
-  uint32 outstanding_vsync_requests_;
+  // Used to track whether this render widget needs a BeginFrame.
+  bool needs_begin_frame_;
 
   bool is_showing_;
 
@@ -400,6 +391,8 @@
   scoped_ptr<TouchSelectionController> selection_controller_;
   bool touch_scrolling_;
   size_t potentially_active_fling_count_;
+
+  bool flush_input_requested_;
 
   int accelerated_surface_route_id_;