Unify SurfaceInfo

cc/surfaces/surface_info.h

Index: cc/surfaces/surface_info.h
diff --git a/cc/surfaces/surface_info.h b/cc/surfaces/surface_info.h
index 877d9b7c54be7ec4a59fb47cf9378db8ce38f6ee..cbe7a0a09dc6fb654dab153dea325876c64e6ece 100644
--- a/cc/surfaces/surface_info.h
+++ b/cc/surfaces/surface_info.h
@@ -9,6 +9,9 @@
 #include "ui/gfx/geometry/size.h"
 
 namespace cc {
+namespace mojom {
+class SurfaceInfoDataView;
+}
 
 // This class contains information about the surface that is being embedded.
 class SurfaceInfo {
@@ -34,6 +37,8 @@ class SurfaceInfo {
   const gfx::Size& size_in_pixels() const { return size_in_pixels_; }
 
  private:
+  friend struct mojo::StructTraits<mojom::SurfaceInfoDataView, SurfaceInfo>;
+
   SurfaceId id_;
   float device_scale_factor_ = 1.f;
   gfx::Size size_in_pixels_;