Let DelegateFrameHost in Mac and Android use correct FrameSinkId during creation

ui/android/delegated_frame_host_android.cc

Index: ui/android/delegated_frame_host_android.cc
diff --git a/ui/android/delegated_frame_host_android.cc b/ui/android/delegated_frame_host_android.cc
index feb9e24abcce19ad057da8d30c979430690f4598..bd013313b1a5174f29bb1405df45eb9d2e358ab8 100644
--- a/ui/android/delegated_frame_host_android.cc
+++ b/ui/android/delegated_frame_host_android.cc
@@ -51,11 +51,12 @@ void CopyOutputRequestCallback(
 
 }  // namespace
 
-DelegatedFrameHostAndroid::DelegatedFrameHostAndroid(ui::ViewAndroid* view,
-                                                     SkColor background_color,
-                                                     Client* client)
-    : frame_sink_id_(
-          ui::ContextProviderFactory::GetInstance()->AllocateFrameSinkId()),
+DelegatedFrameHostAndroid::DelegatedFrameHostAndroid(
+    ui::ViewAndroid* view,
+    SkColor background_color,
+    Client* client,
+    cc::FrameSinkId frame_sink_id)

[Fady Samuel, 2017/01/25 23:23:48]

const cc::FrameSinkId&

[xlai (Olivia), 2017/01/25 23:43:26]

Done here and elsewhere

+    : frame_sink_id_(frame_sink_id),
       view_(view),
       client_(client),
       background_layer_(cc::SolidColorLayer::Create()) {