Remove SurfaceFactory Occurrences Outside Of cc

cc/surfaces/compositor_frame_sink_support.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_SURFACES_COMPOSITOR_FRAME_SINK_SUPPORT_H_
 #define CC_SURFACES_COMPOSITOR_FRAME_SINK_SUPPORT_H_
 
 #include <memory>
 #include <unordered_set>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/referenced_surface_tracker.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
 #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;
 class SurfaceManager;
 
 class CC_SURFACES_EXPORT CompositorFrameSinkSupport
     : public SurfaceFactoryClient,
       public BeginFrameObserver {
  public:
   CompositorFrameSinkSupport(CompositorFrameSinkSupportClient* client,
@@ skipping 18 matching lines @@
   void EvictFrame();
   void SetNeedsBeginFrame(bool needs_begin_frame);
   void BeginFrameDidNotSwap(const BeginFrameAck& ack);
   void SubmitCompositorFrame(const LocalSurfaceId& local_surface_id,
                              CompositorFrame frame);
   void RequestCopyOfSurface(std::unique_ptr<CopyOutputRequest> request);
   void ForceReclaimResources();
   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
   // root references if |display_| is not null.
   void UpdateSurfaceReferences(const SurfaceId& last_surface_id,
                                const LocalSurfaceId& local_surface_id);
 
   void AddTopLevelRootReference(const SurfaceId& surface_id);
   void RemoveTopLevelRootReference(const SurfaceId& surface_id);
 
@@ skipping 59 matching lines @@
   const bool handles_frame_sink_id_invalidation_;
 
   base::WeakPtrFactory<CompositorFrameSinkSupport> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorFrameSinkSupport);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_COMPOSITOR_FRAME_SINK_SUPPORT_H_