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 d8fad7e3bbe56efacfe133dca91c89c279748ed7..d7e37249622203a47dbb9f1b8a65036aa8a1d27e 100644
--- a/cc/surfaces/framesink_manager.cc
+++ b/cc/surfaces/framesink_manager.cc
@@ -8,7 +8,7 @@
 #include <stdint.h>
 
 #include "base/logging.h"
-#include "cc/surfaces/surface_factory_client.h"
+#include "cc/surfaces/compositor_frame_sink_support.h"
 
 #if DCHECK_IS_ON()
 #include <sstream>
@@ -28,8 +28,8 @@ FrameSinkManager::FrameSinkSourceMapping::~FrameSinkSourceMapping() {
 FrameSinkManager::FrameSinkManager() {}
 
 FrameSinkManager::~FrameSinkManager() {
-  // All surface factory clients should be unregistered prior to SurfaceManager
-  // destruction.
+  // All compositor frame supports should be unregistered prior to

[Fady Samuel, 2017/04/06 21:53:23]

All CompositorFrameSinks should be unregistered...

[Alex Z., 2017/04/13 17:15:30]

Done.

+  // SurfaceManager destruction.
   DCHECK_EQ(clients_.size(), 0u);
   DCHECK_EQ(registered_sources_.size(), 0u);
 }
@@ -43,22 +43,22 @@ void FrameSinkManager::InvalidateFrameSinkId(const FrameSinkId& frame_sink_id) {
   valid_frame_sink_ids_.erase(frame_sink_id);
 }
 
-void FrameSinkManager::RegisterSurfaceFactoryClient(
+void FrameSinkManager::RegisterCompositorFrameSinkSupport(

[Fady Samuel, 2017/04/06 21:53:23]

How about just RegisterCompositorFrameSink?

[Alex Z., 2017/04/13 17:15:30]

Done.

     const FrameSinkId& frame_sink_id,
-    SurfaceFactoryClient* client) {
-  DCHECK(client);
+    CompositorFrameSinkSupport* support) {
+  DCHECK(support);
   DCHECK_EQ(valid_frame_sink_ids_.count(frame_sink_id), 1u);
 
-  clients_[frame_sink_id] = client;
+  clients_[frame_sink_id] = support;
 
   auto it = frame_sink_source_map_.find(frame_sink_id);
   if (it != frame_sink_source_map_.end()) {
     if (it->second.source)
-      client->SetBeginFrameSource(it->second.source);
+      support->SetBeginFrameSource(it->second.source);
   }
 }
 
-void FrameSinkManager::UnregisterSurfaceFactoryClient(
+void FrameSinkManager::UnregisterCompositorFrameSinkSupport(

[Fady Samuel, 2017/04/06 21:53:23]

How about just UnregisterCompositorFrameSink?

[Alex Z., 2017/04/13 17:15:30]

Done.

     const FrameSinkId& frame_sink_id) {
   DCHECK_EQ(valid_frame_sink_ids_.count(frame_sink_id), 1u);
   auto client_iter = clients_.find(frame_sink_id);
@@ -207,7 +207,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) &&