Update Surface ID Terminology

cc/surfaces/display.h

Index: cc/surfaces/display.h
diff --git a/cc/surfaces/display.h b/cc/surfaces/display.h
index 9df93d418a93ac9017e05c77f30d43adb1ac4262..3ac3ae588d754831bfe89c02e10a40baceaeb655 100644
--- a/cc/surfaces/display.h
+++ b/cc/surfaces/display.h
@@ -72,13 +72,13 @@ class CC_SURFACES_EXPORT Display : public DisplaySchedulerClient,
 
   // device_scale_factor is used to communicate to the external window system
   // what scale this was rendered at.
-  void SetSurfaceId(SurfaceId id, float device_scale_factor);
+  void SetSurfaceId(const SurfaceId& id, float device_scale_factor);
   void Resize(const gfx::Size& new_size);
   void SetColorSpace(const gfx::ColorSpace& color_space);
   void SetExternalClip(const gfx::Rect& clip);
   void SetOutputIsSecure(bool secure);
 
-  SurfaceId CurrentSurfaceId();
+  const SurfaceId& CurrentSurfaceId();
 
   // DisplaySchedulerClient implementation.
   bool DrawAndSwap() override;
@@ -108,7 +108,7 @@ class CC_SURFACES_EXPORT Display : public DisplaySchedulerClient,
   void SetFullRootLayerDamage() override;
 
   // SurfaceDamageObserver implementation.
-  void OnSurfaceDamaged(SurfaceId surface, bool* changed) override;
+  void OnSurfaceDamaged(const SurfaceId& surface, bool* changed) override;
 
   void SetEnlargePassTextureAmountForTesting(
       const gfx::Size& enlarge_texture_amount) {