Clean up RenderWidgetHostView(ChildFrame and Guest) compositing code

content/browser/frame_host/render_widget_host_view_child_frame.h

Index: content/browser/frame_host/render_widget_host_view_child_frame.h
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.h b/content/browser/frame_host/render_widget_host_view_child_frame.h
index 4c228e40934cf7fcab839841deb7130ef2e30b26..c509b0124bad89eef99eb15dc0693768729bc42e 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame.h
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.h
@@ -19,6 +19,8 @@
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_id_allocator.h"
+#include "cc/surfaces/surface_info.h"
+#include "cc/surfaces/surface_sequence.h"
 #include "content/browser/compositor/image_transport_factory.h"
 #include "content/browser/renderer_host/event_with_latency_info.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
@@ -204,6 +206,14 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
   explicit RenderWidgetHostViewChildFrame(RenderWidgetHost* widget);
   void Init();
 
+  virtual bool ShouldCreateNewSurfaceId(uint32_t compositor_frame_sink_id,
+                                        const cc::CompositorFrame& frame);
+
+  void ProcessCompositorFrame(uint32_t compositor_frame_sink_id,
+                              cc::CompositorFrame frame);
+
+  void SendSurfaceInfoToEmbedder();
+
   // Clears current compositor surface, if one is in use.
   void ClearCompositorSurfaceIfNecessary();
 
@@ -240,6 +250,10 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
   }
 
  private:
+  virtual void SendSurfaceInfoToEmbedderImpl(
+      const cc::SurfaceInfo& surface_info,
+      const cc::SurfaceSequence& sequence);
+
   void SubmitSurfaceCopyRequest(const gfx::Rect& src_subrect,
                                 const gfx::Size& dst_size,
                                 const ReadbackRequestCallback& callback,