Remove SurfaceFactory And SurfaceFactoryClient

cc/surfaces/framesink_manager.cc

Index: cc/surfaces/framesink_manager.cc
diff --git a/cc/surfaces/framesink_manager.cc b/cc/surfaces/framesink_manager.cc
index 8095f627b1b23bb8fd1111ea59174a9943bc51ad..dc515275af59a7a6ec25b6d9037db4323bd2727e 100644
--- a/cc/surfaces/framesink_manager.cc
+++ b/cc/surfaces/framesink_manager.cc
@@ -9,7 +9,6 @@
 
 #include "base/logging.h"
 #include "cc/surfaces/framesink_manager_client.h"
-#include "cc/surfaces/surface_factory_client.h"
 
 #if DCHECK_IS_ON()
 #include <sstream>
@@ -29,8 +28,8 @@ FrameSinkManager::FrameSinkSourceMapping::~FrameSinkSourceMapping() {
 FrameSinkManager::FrameSinkManager() {}
 
 FrameSinkManager::~FrameSinkManager() {
-  // All surface factory clients should be unregistered prior to SurfaceManager
-  // destruction.
+  // All CompositorFrameSinks should be unregistered prior to
+  // SurfaceManager destruction.
   DCHECK_EQ(clients_.size(), 0u);
   DCHECK_EQ(registered_sources_.size(), 0u);
 }
@@ -128,8 +127,9 @@ void FrameSinkManager::RecursivelyDetachBeginFrameSource(
   if (iter->second.source == source) {
     iter->second.source = nullptr;
     auto client_iter = clients_.find(frame_sink_id);
-    if (client_iter != clients_.end())
+    if (client_iter != clients_.end()) {
       client_iter->second->SetBeginFrameSource(nullptr);
+    }
   }
 
   if (!iter->second.has_children() && !clients_.count(frame_sink_id)) {
@@ -208,7 +208,7 @@ void FrameSinkManager::UnregisterFrameSinkHierarchy(
   }
   DCHECK(found_child);
 
-  // The SurfaceFactoryClient and hierarchy can be registered/unregistered
+  // The CompositorFrameSinkSupport and hierarchy can be registered/unregistered
   // in either order, so empty frame_sink_source_map entries need to be
   // checked when removing either clients or relationships.
   if (!iter->second.has_children() && !clients_.count(parent_frame_sink_id) &&