Convert BrowserPlugin to render using cc::Surfaces.

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 db4ab4e1e3683e782afed52b9fe8a9c7977a9c49..28294d6875a51fb6cf543568a3f15f1b338841b0 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
@@ -27,6 +27,7 @@ class CrossProcessFrameConnector;
 class RenderWidgetHost;
 class RenderWidgetHostImpl;
 class RenderWidgetHostViewChildFrameTest;
+class RenderWidgetHostViewGuestSurfaceTest;
 
 // RenderWidgetHostViewChildFrame implements the view for a RenderWidgetHost
 // associated with content being rendered in a separate process from
@@ -148,11 +149,14 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
   // cc::SurfaceFactoryClient implementation.
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;
 
+  // Declared 'public' instead of 'protected' here to allow derived classes
+  // to Bind() to it.
+  void SurfaceDrawn(uint32 output_surface_id, cc::SurfaceDrawStatus drawn);
+
  protected:
   friend class RenderWidgetHostView;
   friend class RenderWidgetHostViewChildFrameTest;
-
-  void SurfaceDrawn(uint32 output_surface_id, cc::SurfaceDrawStatus drawn);
+  friend class RenderWidgetHostViewGuestSurfaceTest;
 
   // The last scroll offset of the view.
   gfx::Vector2dF last_scroll_offset_;
@@ -179,11 +183,11 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
   // sent through it are routed to the embedding renderer process.
   CrossProcessFrameConnector* frame_connector_;
 
- private:
   base::WeakPtr<RenderWidgetHostViewChildFrame> AsWeakPtr() {
     return weak_factory_.GetWeakPtr();
   }
 
+ private:
   base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
 };