Clean up RenderWidgetHostView(ChildFrame and Guest) compositing code

content/renderer/browser_plugin/browser_plugin.h

Index: content/renderer/browser_plugin/browser_plugin.h
diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h
index 3163dffd69394677ea953a54864d722cc64edaa9..47900ad6fcfcedecb87676a6fe5fc6239d88cad1 100644
--- a/content/renderer/browser_plugin/browser_plugin.h
+++ b/content/renderer/browser_plugin/browser_plugin.h
@@ -20,7 +20,7 @@
 #include "third_party/WebKit/public/web/WebNode.h"
 
 namespace cc {
-class SurfaceId;
+class SurfaceInfo;
 struct SurfaceSequence;
 }
 
@@ -156,9 +156,7 @@ class CONTENT_EXPORT BrowserPlugin :
   void OnGuestGone(int instance_id);
   void OnGuestReady(int instance_id);
   void OnSetChildFrameSurface(int instance_id,
-                              const cc::SurfaceId& surface_id,
-                              const gfx::Size& frame_size,
-                              float scale_factor,
+                              const cc::SurfaceInfo& surface_info,
                               const cc::SurfaceSequence& sequence);
   void OnSetContentsOpaque(int instance_id, bool opaque);
   void OnSetCursor(int instance_id, const WebCursor& cursor);