Introducing SurfaceReferenceFactory

content/renderer/child_frame_compositing_helper.h

Index: content/renderer/child_frame_compositing_helper.h
diff --git a/content/renderer/child_frame_compositing_helper.h b/content/renderer/child_frame_compositing_helper.h
index fc15ef8937d9369f433e0ec94a96076d35c9bd42..634f4af6f234afb43a5f7e5dc5c1fdf63fce5f95 100644
--- a/content/renderer/child_frame_compositing_helper.h
+++ b/content/renderer/child_frame_compositing_helper.h
@@ -16,6 +16,7 @@
 #include "base/memory/shared_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/surfaces/surface_id.h"
+#include "cc/surfaces/surface_reference_factory.h"
 #include "content/common/content_export.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -39,7 +40,6 @@ namespace content {
 
 class BrowserPlugin;
 class RenderFrameProxy;
-class ThreadSafeSender;
 
 class CONTENT_EXPORT ChildFrameCompositingHelper
     : public base::RefCounted<ChildFrameCompositingHelper> {
@@ -77,40 +77,24 @@ class CONTENT_EXPORT ChildFrameCompositingHelper
   void CheckSizeAndAdjustLayerProperties(const gfx::Size& new_size,
                                          float device_scale_factor,
                                          cc::Layer* layer);
-  static void SatisfyCallback(scoped_refptr<ThreadSafeSender> sender,
-                              int host_routing_id,
-                              const cc::SurfaceSequence& sequence);
-  static void SatisfyCallbackBrowserPlugin(
-      scoped_refptr<ThreadSafeSender> sender,
-      int host_routing_id,
-      int browser_plugin_instance_id,
-      const cc::SurfaceSequence& sequence);
-  static void RequireCallback(scoped_refptr<ThreadSafeSender> sender,
-                              int host_routing_id,
-                              const cc::SurfaceId& id,
-                              const cc::SurfaceSequence& sequence);
-  static void RequireCallbackBrowserPlugin(
-      scoped_refptr<ThreadSafeSender> sender,
-      int host_routing_id,
-      int browser_plugin_instance_id,
-      const cc::SurfaceId& id,
-      const cc::SurfaceSequence& sequence);
   void UpdateWebLayer(std::unique_ptr<blink::WebLayer> layer);
 
-  int host_routing_id_;
+  const int host_routing_id_;
 
   gfx::Size buffer_size_;
 
   // The lifetime of this weak pointer should be greater than the lifetime of
   // other member objects, as they may access this pointer during their
   // destruction.
-  base::WeakPtr<BrowserPlugin> browser_plugin_;
-  RenderFrameProxy* render_frame_proxy_;
+  const base::WeakPtr<BrowserPlugin> browser_plugin_;
+  RenderFrameProxy* const render_frame_proxy_;
 
   std::unique_ptr<blink::WebLayer> web_layer_;
   cc::SurfaceId surface_id_;
   blink::WebRemoteFrame* frame_;
 
+  scoped_refptr<cc::SurfaceReferenceFactory> surface_reference_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ChildFrameCompositingHelper);
 };