Implement cc::SurfaceId StructTraits

mojo/converters/surfaces/surfaces_type_converters.h

Index: mojo/converters/surfaces/surfaces_type_converters.h
diff --git a/mojo/converters/surfaces/surfaces_type_converters.h b/mojo/converters/surfaces/surfaces_type_converters.h
index 96efcf3b4dc92148d3425e71b9e1268a590b6c95..849b91c868680d174f470f808e9195f7928fb8ea 100644
--- a/mojo/converters/surfaces/surfaces_type_converters.h
+++ b/mojo/converters/surfaces/surfaces_type_converters.h
@@ -7,12 +7,12 @@
 
 #include <memory>
 
+#include "cc/ipc/surface_id.mojom.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/resources/transferable_resource.h"
 #include "cc/surfaces/surface_id.h"
 #include "components/mus/public/interfaces/compositor_frame.mojom.h"
 #include "components/mus/public/interfaces/quads.mojom.h"
-#include "components/mus/public/interfaces/surface_id.mojom.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "gpu/command_buffer/common/sync_token.h"
@@ -32,18 +32,6 @@ namespace mojo {
 
 class CustomSurfaceConverter;
 
-// Types from surface_id.mojom
-template <>
-struct MOJO_SURFACES_EXPORT

[Ken Rockot(use gerrit already), 2016/05/26 16:58:22]

Woohoo!

[Fady Samuel, 2016/05/26 17:45:09]

Acknowledged.

-    TypeConverter<mus::mojom::SurfaceIdPtr, cc::SurfaceId> {
-  static mus::mojom::SurfaceIdPtr Convert(const cc::SurfaceId& input);
-};
-template <>
-struct MOJO_SURFACES_EXPORT
-    TypeConverter<cc::SurfaceId, mus::mojom::SurfaceIdPtr> {
-  static cc::SurfaceId Convert(const mus::mojom::SurfaceIdPtr& input);
-};
-
 // Types from quads.mojom
 template <>
 struct MOJO_SURFACES_EXPORT TypeConverter<mus::mojom::ColorPtr, SkColor> {