Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

ui/compositor/compositor.h

Index: ui/compositor/compositor.h
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index 58b8224ab19b7fdbf051e25bee5e3b090d7937f1..eff5a50b8c3d859dfeab55087231ad50a304321f 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -384,9 +384,7 @@ class COMPOSITOR_EXPORT Compositor
     return &layer_animator_collection_;
   }
 
-  cc::SurfaceIdAllocator* surface_id_allocator() {
-    return surface_id_allocator_.get();
-  }
+  const cc::FrameSinkId& frame_sink_id() const { return frame_sink_id_; }
 
  private:
   friend class base::RefCounted<Compositor>;
@@ -413,10 +411,10 @@ class COMPOSITOR_EXPORT Compositor
   ui::Window* window_;
 #endif
   // A map from child id to parent id.
-  std::unordered_map<cc::FrameSinkId, cc::FrameSinkId, cc::FrameSinkIdHash>
-      frame_sinks_;
+  std::unordered_set<cc::FrameSinkId, cc::FrameSinkIdHash> child_frame_sinks_;
   bool widget_valid_;
   bool compositor_frame_sink_requested_;
+  cc::FrameSinkId frame_sink_id_;

[sky, 2016/10/03 19:18:25]

And here.

[Fady Samuel, 2016/10/03 19:45:29]

Done.

   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
   scoped_refptr<cc::Layer> root_web_layer_;
   std::unique_ptr<cc::LayerTreeHost> host_;