Unify SurfaceInfo

ui/aura/mus/surface_id_handler.h

Index: ui/aura/mus/surface_id_handler.h
diff --git a/ui/aura/mus/surface_id_handler.h b/ui/aura/mus/surface_id_handler.h
index 01e4e64ad668c5c04ecb90d859a1531258079f10..4f5c8d34871467bf59554f474378ee800a7a449f 100644
--- a/ui/aura/mus/surface_id_handler.h
+++ b/ui/aura/mus/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 aura {
 
 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 aura