Unify SurfaceInfo

services/ui/public/cpp/surface_id_handler.h

Index: services/ui/public/cpp/surface_id_handler.h
diff --git a/services/ui/public/cpp/surface_id_handler.h b/services/ui/public/cpp/surface_id_handler.h
index 509edf7f1c11943fd405a97141daa4d3cf41d16a..3c272a18ac8f79a3498f46f586504ce15d4c24c2 100644
--- a/services/ui/public/cpp/surface_id_handler.h
+++ b/services/ui/public/cpp/surface_id_handler.h
@@ -8,22 +8,14 @@
 #include "cc/surfaces/surface_id.h"
 #include "ui/gfx/geometry/size.h"
 
+namespace cc {
+class SurfaceInfo;
+}
+
 namespace ui {
 
 class Window;
 
-// Holds information about the current surface held by a Window.
-// |surface_id| uniquely identifies the surface in the display
-// compositor.
-// |frame_size| is the size of the frame held by the surface.
-// |device_scale_factor| is the scale factor that the frame was
-// renderered for.
-struct SurfaceInfo {
-  cc::SurfaceId surface_id;
-  gfx::Size frame_size;
-  float device_scale_factor;
-};
-
 class SurfaceIdHandler {
  public:
   // Called when a child window allocates a new surface ID.
@@ -32,7 +24,7 @@ class SurfaceIdHandler {
   // |surface_info| will refer to a null pointer.
   virtual void OnChildWindowSurfaceChanged(
       Window* window,
-      std::unique_ptr<SurfaceInfo>* surface_info) = 0;
+      const cc::SurfaceInfo& surface_info) = 0;
 };
 
 }  // namespace ui