Update Surface ID Terminology

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 3845 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, SurfaceIdNamespaceInitialized) {
+TEST_F(RenderWidgetHostViewAuraTest, SurfaceClientIdInitialized) {
   gfx::Size size(5, 5);
 
   const IPC::Message* msg =
-      sink_->GetUniqueMessageMatching(ViewMsg_SetSurfaceIdNamespace::ID);
+      sink_->GetUniqueMessageMatching(ViewMsg_SetSurfaceClientId::ID);
   EXPECT_TRUE(msg);
-  ViewMsg_SetSurfaceIdNamespace::Param params;
-  ViewMsg_SetSurfaceIdNamespace::Read(msg, &params);
+  ViewMsg_SetSurfaceClientId::Param params;
+  ViewMsg_SetSurfaceClientId::Read(msg, &params);
   view_->InitAsChild(NULL);
   view_->Show();
   view_->SetSize(size);
   view_->OnSwapCompositorFrame(0,
                                MakeDelegatedFrame(1.f, size, gfx::Rect(size)));
-  EXPECT_EQ(view_->GetSurfaceIdNamespace(), std::get<0>(params));
+  EXPECT_EQ(view_->GetSurfaceClientId(), 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 404 matching lines @@
     anchor_bound.set_type(gfx::SelectionBound::LEFT);
     focus_bound.set_type(gfx::SelectionBound::RIGHT);
     gfx::Rect measured_rect =
         gfx::RectBetweenSelectionBounds(anchor_bound, focus_bound);
 
     EXPECT_EQ(measured_rect, text_input_client()->GetCaretBounds());
   }
 }
 
 }  // namespace content