Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

ui/android/delegated_frame_host_android.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 UI_ANDROID_DELEGATED_FRAME_HOST_ANDROID_H_
 #define UI_ANDROID_DELEGATED_FRAME_HOST_ANDROID_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 58 matching lines @@
   void RegisterFrameSinkHierarchy(const cc::FrameSinkId& parent_id);
   void UnregisterFrameSinkHierarchy();
 
  private:
   // cc::SurfaceFactoryClient implementation.
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;
   void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
 
   void UpdateBackgroundLayer();
 
+  cc::FrameSinkId frame_sink_id_;

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

And here.

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

Done.

+
   ViewAndroid* view_;
 
   cc::SurfaceManager* surface_manager_;
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
   cc::FrameSinkId registered_parent_frame_sink_id_;
   ReturnResourcesCallback return_resources_callback_;
 
   std::unique_ptr<cc::SurfaceFactory> surface_factory_;
 
   struct FrameData {
@@ skipping 16 matching lines @@
   scoped_refptr<cc::Layer> background_layer_;
 
   gfx::Size container_size_in_dip_;
 
   DISALLOW_COPY_AND_ASSIGN(DelegatedFrameHostAndroid);
 };
 
 }  // namespace ui
 
 #endif  // UI_ANDROID_DELEGATED_FRAME_HOST_ANDROID_H_