Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

blimp/client/core/compositor/blimp_compositor.h

 // Copyright 2015 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.
 
 #ifndef BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_
 #define BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 171 matching lines @@
   // of the count.
   void CheckPendingCommitCounts(bool flush);
 
   // The unique identifier for the render widget for this compositor.
   const int render_widget_id_;
 
   BlimpCompositorClient* client_;
 
   BlimpCompositorDependencies* compositor_dependencies_;
 
+  cc::FrameSinkId frame_sink_id_;
+
   std::unique_ptr<cc::LayerTreeHost> host_;
 
   // The SurfaceFactory is bound to the lifetime of the |proxy_client_|. When
   // detached, the surface factory will be destroyed.
   std::unique_ptr<cc::SurfaceFactory> surface_factory_;
   base::WeakPtr<BlimpCompositorFrameSinkProxyClient> proxy_client_;
 
   // Whether or not |host_| has asked for a new CompositorFrameSink.
   bool compositor_frame_sink_request_pending_;
 
@@ skipping 32 matching lines @@
 
   base::WeakPtrFactory<BlimpCompositor> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpCompositor);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_