Remove SurfaceFactory Occurrences Outside Of cc

cc/surfaces/compositor_frame_sink_support.h

Index: cc/surfaces/compositor_frame_sink_support.h
diff --git a/cc/surfaces/compositor_frame_sink_support.h b/cc/surfaces/compositor_frame_sink_support.h
index bdafb4933e6c0f752edc1fde38a9d63fd003d6b5..707095d82fff5221b5c47a169d526fee99d6534e 100644
--- a/cc/surfaces/compositor_frame_sink_support.h
+++ b/cc/surfaces/compositor_frame_sink_support.h
@@ -19,6 +19,10 @@
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surfaces_export.h"
 
+namespace content {

[piman, 2017/04/10 17:46:10]

This is a layering violation...
If all you need is SetBeginFrameSource, maybe you can add a
SetBeginFrameSourceForTest forwarding function instead?

[Alex Z., 2017/04/10 19:12:08]

Following the discussion on Slack, the implementation of 
SurfaceFactoryClient is made public and thus the friendship is no 
longer needed.

+class RenderWidgetHostViewChildFrameTest;
+}  // namespace content
+
 namespace cc {
 
 class CompositorFrameSinkSupportClient;
@@ -57,6 +61,8 @@ class CC_SURFACES_EXPORT CompositorFrameSinkSupport
   void ClaimTemporaryReference(const SurfaceId& surface_id);
 
  private:
+  friend class content::RenderWidgetHostViewChildFrameTest;
+
   // Update surface references with SurfaceManager for current CompositorFrame
   // that has |local_surface_id|. UpdateReferences() must be called on
   // |reference_tracker_| before calling this. Will add and remove top-level