Update Surface ID Terminology

cc/surfaces/display.cc

Index: cc/surfaces/display.cc
diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
index f45842d966972bfa7e29b02f09ced84c4e329b7e..cc19376fd8f83bf398f7ceced6cc401dcba40150 100644
--- a/cc/surfaces/display.cc
+++ b/cc/surfaces/display.cc
@@ -92,8 +92,8 @@ void Display::Initialize(DisplayClient* client) {
   DCHECK(ok);
 }
 
-void Display::SetSurfaceId(SurfaceId id, float device_scale_factor) {
-  DCHECK_EQ(id.id_namespace(), compositor_surface_namespace_);
+void Display::SetSurfaceId(const SurfaceId& id, float device_scale_factor) {
+  DCHECK_EQ(id.client_id(), compositor_surface_namespace_);
   if (current_surface_id_ == id && device_scale_factor_ == device_scale_factor)
     return;
 
@@ -402,7 +402,7 @@ void Display::SetFullRootLayerDamage() {
     aggregator_->SetFullDamageForSurface(current_surface_id_);
 }
 
-void Display::OnSurfaceDamaged(SurfaceId surface_id, bool* changed) {
+void Display::OnSurfaceDamaged(const SurfaceId& surface_id, bool* changed) {
   if (aggregator_ &&
       aggregator_->previous_contained_surfaces().count(surface_id)) {
     Surface* surface = surface_manager_->GetSurfaceForId(surface_id);
@@ -426,7 +426,7 @@ void Display::OnSurfaceDamaged(SurfaceId surface_id, bool* changed) {
     UpdateRootSurfaceResourcesLocked();
 }
 
-SurfaceId Display::CurrentSurfaceId() {
+const SurfaceId& Display::CurrentSurfaceId() {
   return current_surface_id_;
 }