Unify SurfaceInfo

services/ui/public/cpp/window.h

Index: services/ui/public/cpp/window.h
diff --git a/services/ui/public/cpp/window.h b/services/ui/public/cpp/window.h
index 015540cb9c0248383dc1f1a450b65986ea02efa1..a5e809256926b3945eb31670d15f8fc4a5613367 100644
--- a/services/ui/public/cpp/window.h
+++ b/services/ui/public/cpp/window.h
@@ -11,6 +11,7 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
+#include "cc/surfaces/surface_info.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "services/service_manager/public/interfaces/interface_provider.mojom.h"
 #include "services/ui/common/types.h"
@@ -319,7 +320,7 @@ class Window {
   void LocalSetPredefinedCursor(mojom::Cursor cursor_id);
   void LocalSetSharedProperty(const std::string& name,
                               const std::vector<uint8_t>* data);
-  void LocalSetSurfaceId(std::unique_ptr<SurfaceInfo> surface_info);
+  void LocalSetSurfaceInfo(const cc::SurfaceInfo& surface_info);
 
   // Notifies this winodw that its stacking position has changed.
   void NotifyWindowStackingChanged();
@@ -405,7 +406,7 @@ class Window {
 
   std::map<const void*, Value> prop_map_;
 
-  std::unique_ptr<SurfaceInfo> surface_info_;
+  cc::SurfaceInfo surface_info_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };