Replace usage of SurfaceId's client_id with FrameSinkId

content/test/test_render_view_host.h

 // Copyright (c) 2012 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 CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 103 matching lines @@
       const gfx::Rect& src_subrect,
       const scoped_refptr<media::VideoFrame>& target,
       const base::Callback<void(const gfx::Rect&, bool)>& callback) override;
   bool CanCopyToVideoFrame() const override;
   bool HasAcceleratedSurface(const gfx::Size& desired_size) override;
   void LockCompositingSurface() override {}
   void UnlockCompositingSurface() override {}
   gfx::Rect GetBoundsInRootWindow() override;
   bool LockMouse() override;
   void UnlockMouse() override;
-  uint32_t GetSurfaceClientId() override;
+  cc::FrameSinkId GetFrameSinkId() override;
 
   bool is_showing() const { return is_showing_; }
   bool is_occluded() const { return is_occluded_; }
   bool did_swap_compositor_frame() const { return did_swap_compositor_frame_; }
 
  protected:
   RenderWidgetHostImpl* rwh_;
 
  private:
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
@@ skipping 166 matching lines @@
  private:
   typedef std::unique_ptr<ui::test::ScopedSetSupportedScaleFactors>
       ScopedSetSupportedScaleFactors;
   ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_