Replace usage of SurfaceId's client_id with FrameSinkId

content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

 // 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.
 
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <tuple>
@@ skipping 4098 matching lines @@
   EXPECT_EQ("0 1 0", delegate.GetMouseMotionCountsAndReset());
 
   view_->UnlockMouse();
 
   // view_ will be destroyed when parent is destroyed.
   view_ = nullptr;
 }
 
 // Tests the RenderWidgetHostImpl sends the correct surface ID namespace to
 // the renderer process.
-TEST_F(RenderWidgetHostViewAuraTest, SurfaceClientIdInitialized) {
+TEST_F(RenderWidgetHostViewAuraTest, FrameSinkIdInitialized) {
   gfx::Size size(5, 5);
 
   const IPC::Message* msg =
-      sink_->GetUniqueMessageMatching(ViewMsg_SetSurfaceClientId::ID);
+      sink_->GetUniqueMessageMatching(ViewMsg_SetFrameSinkId::ID);
   EXPECT_TRUE(msg);
-  ViewMsg_SetSurfaceClientId::Param params;
-  ViewMsg_SetSurfaceClientId::Read(msg, &params);
+  ViewMsg_SetFrameSinkId::Param params;
+  ViewMsg_SetFrameSinkId::Read(msg, &params);
   view_->InitAsChild(nullptr);
   view_->Show();
   view_->SetSize(size);
   view_->OnSwapCompositorFrame(0,
                                MakeDelegatedFrame(1.f, size, gfx::Rect(size)));
-  EXPECT_EQ(view_->GetSurfaceClientId(), std::get<0>(params));
+  EXPECT_EQ(view_->GetFrameSinkId(), std::get<0>(params));
 }
 
 // This class provides functionality to test a RenderWidgetHostViewAura
 // instance which has been hooked up to a test RenderViewHost instance and
 // a WebContents instance.
 class RenderWidgetHostViewAuraWithViewHarnessTest
     : public RenderViewHostImplTestHarness {
  public:
    RenderWidgetHostViewAuraWithViewHarnessTest()
       : view_(nullptr) {}
@@ skipping 532 matching lines @@
 
     // Retrieve the selected text from clipboard and verify it is as expected.
     base::string16 result_text;
     clipboard->ReadText(ui::CLIPBOARD_TYPE_SELECTION, &result_text);
     EXPECT_EQ(expected_text, result_text);
   }
 }
 #endif
 
 }  // namespace content