Replace usage of SurfaceId's client_id with 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 32 matching lines @@
 
   ~DelegatedFrameHostAndroid() override;
 
   void SubmitCompositorFrame(cc::CompositorFrame frame,
                              cc::SurfaceFactory::DrawCallback draw_callback);
 
   void DestroyDelegatedContent();
 
   bool HasDelegatedContent() const;
 
-  uint32_t GetSurfaceClientId() const;
+  cc::FrameSinkId GetFrameSinkId() const;
 
   // Should only be called when the host has a content layer.
   void RequestCopyOfSurface(
       WindowAndroidCompositor* compositor,
       const gfx::Rect& src_subrect_in_pixel,
       cc::CopyOutputRequest::CopyOutputRequestCallback result_callback);
 
   void CompositorFrameSinkChanged();
 
   void UpdateBackgroundColor(SkColor color);
 
   void UpdateContainerSizeinDIP(const gfx::Size& size_in_dip);
 
   // Called when this DFH is attached/detached from a parent browser compositor
   // and needs to be attached to the surface hierarchy.
-  void RegisterSurfaceNamespaceHierarchy(uint32_t parent_id);
-  void UnregisterSurfaceNamespaceHierarchy();
+  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();
 
   ViewAndroid* view_;
 
   cc::SurfaceManager* surface_manager_;
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
-  uint32_t registered_parent_client_id_ = 0u;
+  cc::FrameSinkId registered_parent_frame_sink_id_;
   ReturnResourcesCallback return_resources_callback_;
 
   std::unique_ptr<cc::SurfaceFactory> surface_factory_;
 
   struct FrameData {
     FrameData();
     ~FrameData();
 
     cc::SurfaceId surface_id;
     gfx::Size surface_size;
@@ skipping 11 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_