Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

blimp/client/support/compositor/blimp_embedder_compositor.h

 // Copyright 2016 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_SUPPORT_COMPOSITOR_BLIMP_EMBEDDER_COMPOSITOR_H_
 #define BLIMP_CLIENT_SUPPORT_COMPOSITOR_BLIMP_EMBEDDER_COMPOSITOR_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/layers/layer.h"
+#include "cc/surfaces/frame_sink_id.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_single_thread_client.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace cc {
 class Display;
 class LayerTreeHost;
-class SurfaceIdAllocator;
 class SurfaceManager;
 }  // namespace cc
 
 namespace blimp {
 namespace client {
 class CompositorDependencies;
 
 // The parent compositor that embeds the content from the BlimpCompositor for
 // the current page and draws it to a display.
 class BlimpEmbedderCompositor : public cc::LayerTreeHostClient,
@@ skipping 39 matching lines @@
 
   // LayerTreeHostSingleThreadClient implementation.
   void DidPostSwapBuffers() override {}
   void DidAbortSwapBuffers() override {}
 
  private:
   void HandlePendingCompositorFrameSinkRequest();
 
   CompositorDependencies* compositor_dependencies_;
 
+  cc::FrameSinkId frame_sink_id_;
+
   scoped_refptr<cc::ContextProvider> context_provider_;
 
-  std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
   bool compositor_frame_sink_request_pending_;
   std::unique_ptr<cc::Display> display_;
 
   gfx::Size viewport_size_in_px_;
 
   std::unique_ptr<cc::LayerTreeHost> host_;
   scoped_refptr<cc::Layer> root_layer_;
 
   base::Closure did_complete_swap_buffers_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpEmbedderCompositor);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_SUPPORT_COMPOSITOR_BLIMP_EMBEDDER_COMPOSITOR_H_