Remove SurfaceFactory And SurfaceFactoryClient

cc/surfaces/surface_resource_holder.cc

 // Copyright 2014 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.
 
 #include "cc/surfaces/surface_resource_holder.h"
 
-#include "cc/surfaces/surface_factory_client.h"
+#include "cc/surfaces/compositor_frame_sink_support.h"
 
 namespace cc {
 
-SurfaceResourceHolder::SurfaceResourceHolder(SurfaceFactoryClient* client)
-    : client_(client) {
-}
+SurfaceResourceHolder::SurfaceResourceHolder(CompositorFrameSinkSupport* client)
+    : client_(client) {}
 
 SurfaceResourceHolder::~SurfaceResourceHolder() {
 }
 
 SurfaceResourceHolder::ResourceRefs::ResourceRefs()
     : refs_received_from_child(0), refs_holding_resource_alive(0) {
 }
 
 void SurfaceResourceHolder::Reset() {
   resource_id_info_map_.clear();
@@ skipping 44 matching lines @@
       returned.count = ref.refs_received_from_child;
       resources_available_to_return.push_back(returned);
       resource_id_info_map_.erase(count_it);
     }
   }
 
   client_->ReturnResources(resources_available_to_return);
 }
 
 }  // namespace cc