Implement cc::SurfaceId StructTraits

components/mus/public/cpp/surfaces/surfaces_type_converters.h

Index: components/mus/public/cpp/surfaces/surfaces_type_converters.h
diff --git a/components/mus/public/cpp/surfaces/surfaces_type_converters.h b/components/mus/public/cpp/surfaces/surfaces_type_converters.h
index 2e3ab3d67e7c120d5f3d5efb10092a719cc291e2..c325ea81f10d9b6a9b972b57651989bfe96d99dc 100644
--- a/components/mus/public/cpp/surfaces/surfaces_type_converters.h
+++ b/components/mus/public/cpp/surfaces/surfaces_type_converters.h
@@ -7,13 +7,13 @@
 
 #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/cpp/surfaces/mojo_surfaces_export.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
-    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> {