Remove SurfaceFactory And SurfaceFactoryClient

cc/surfaces/surface_resource_holder.h

Index: cc/surfaces/surface_resource_holder.h
diff --git a/cc/surfaces/surface_resource_holder.h b/cc/surfaces/surface_resource_holder.h
index 5d222864e8b41cc7c43a99fc601473dec7ee1906..6d42429ec62f169790ad591f696b8a450bde0e10 100644
--- a/cc/surfaces/surface_resource_holder.h
+++ b/cc/surfaces/surface_resource_holder.h
@@ -14,7 +14,7 @@
 #include "cc/surfaces/surfaces_export.h"
 
 namespace cc {
-class SurfaceFactoryClient;
+class CompositorFrameSinkSupport;
 
 // A SurfaceResourceHolder manages the lifetime of resources submitted by a
 // particular SurfaceFactory. Each resource is held by the service until
@@ -22,7 +22,7 @@ class SurfaceFactoryClient;
 // resource providers.
 class CC_SURFACES_EXPORT SurfaceResourceHolder {
  public:
-  explicit SurfaceResourceHolder(SurfaceFactoryClient* client);
+  explicit SurfaceResourceHolder(CompositorFrameSinkSupport* client);
   ~SurfaceResourceHolder();
 
   void Reset();
@@ -31,7 +31,7 @@ class CC_SURFACES_EXPORT SurfaceResourceHolder {
   void UnrefResources(const ReturnedResourceArray& resources);
 
  private:
-  SurfaceFactoryClient* client_;
+  CompositorFrameSinkSupport* client_;
 
   struct ResourceRefs {
     ResourceRefs();