Clean up RenderWidgetHostView(ChildFrame and Guest) compositing code

content/browser/browser_plugin/browser_plugin_guest.h

Index: content/browser/browser_plugin/browser_plugin_guest.h
diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h
index 2b5a348aae7bdac542c4c0e285ac7aad92f61302..dd23cd7ececdb2286cda84f99b0047f0328af896 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.h
+++ b/content/browser/browser_plugin/browser_plugin_guest.h
@@ -52,6 +52,7 @@ struct FrameHostMsg_ShowPopup_Params;
 
 namespace cc {
 class SurfaceId;
+class SurfaceInfo;
 struct SurfaceSequence;
 }  // namespace cc
 
@@ -239,9 +240,7 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
   void PointerLockPermissionResponse(bool allow);
 
   // The next function is virtual for test purposes.
-  virtual void SetChildFrameSurface(const cc::SurfaceId& surface_id,
-                                    const gfx::Size& frame_size,
-                                    float scale_factor,
+  virtual void SetChildFrameSurface(const cc::SurfaceInfo& surface_info,
                                     const cc::SurfaceSequence& sequence);
 
   // Find the given |search_text| in the page. Returns true if the find request