Consolidate UpdateFrameInfo and SwapCompositorFrame.

content/browser/android/content_view_core_impl.h

Index: content/browser/android/content_view_core_impl.h
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index 72a7256e6392926b193fc73f311725e0523716e4..45dddfd4969938d4d7b75e23748e20216b0b6207 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -213,8 +213,6 @@ class ContentViewCoreImpl : public ContentViewCore,
                             jint delegate);
   jboolean IsShowingInterstitialPage(JNIEnv* env, jobject obj);
 
-  jboolean ConsumePendingRendererFrame(JNIEnv* env, jobject obj);
-
   void AttachExternalVideoSurface(JNIEnv* env,
                                   jobject obj,
                                   jint player_id,
@@ -284,7 +282,6 @@ class ContentViewCoreImpl : public ContentViewCore,
 
   void AttachLayer(scoped_refptr<cc::Layer> layer);
   void RemoveLayer(scoped_refptr<cc::Layer> layer);
-  void DidProduceRendererFrame();
 
  private:
   class ContentViewUserData;
@@ -338,10 +335,6 @@ class ContentViewCoreImpl : public ContentViewCore,
   // Whether input events will be consistently delivered at vsync time.
   bool input_events_delivered_at_vsync_;
 
-  // Whether a new frame from the renderer is waiting to be displayed by the
-  // browser compositor.
-  bool renderer_frame_pending_;
-
   // Device scale factor.
   float dpi_scale_;