Move mojo/services/public/cpp TypeConverters to mojo/converters.

mojo/converters/surfaces_type_converters.h

Index: mojo/converters/surfaces_type_converters.h
diff --git a/mojo/services/public/cpp/surfaces/surfaces_type_converters.h b/mojo/converters/surfaces_type_converters.h
similarity index 71%
rename from mojo/services/public/cpp/surfaces/surfaces_type_converters.h
rename to mojo/converters/surfaces_type_converters.h
index 4ef0e2c1cc0338a6e2e252c4fc87803c8c622e58..31ec69a99eab565125ce42bafbd20a0170cc8654 100644
--- a/mojo/services/public/cpp/surfaces/surfaces_type_converters.h
+++ b/mojo/converters/surfaces_type_converters.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SERVICES_PUBLIC_CPP_SURFACES_SURFACES_TYPE_CONVERTERS_H_
-#define MOJO_SERVICES_PUBLIC_CPP_SURFACES_SURFACES_TYPE_CONVERTERS_H_
+#ifndef MOJO_CONVERTERS_SURFACES_TYPE_CONVERTERS_H_
+#define MOJO_CONVERTERS_SURFACES_TYPE_CONVERTERS_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/resources/returned_resource.h"
@@ -11,7 +11,7 @@
 #include "cc/surfaces/surface_id.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
-#include "mojo/services/public/cpp/surfaces/mojo_surfaces_export.h"
+#include "mojo/converters/mojo_converters_export.h"
 #include "mojo/services/public/interfaces/surfaces/quads.mojom.h"
 #include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"
 #include "mojo/services/public/interfaces/surfaces/surfaces.mojom.h"
@@ -29,129 +29,130 @@ namespace mojo {
 
 // Types from surface_id.mojom
 template <>
-struct MOJO_SURFACES_EXPORT TypeConverter<SurfaceIdPtr, cc::SurfaceId> {
+struct MOJO_CONVERTERS_EXPORT TypeConverter<SurfaceIdPtr, cc::SurfaceId> {
   static SurfaceIdPtr Convert(const cc::SurfaceId& input);
 };
 template <>
-struct MOJO_SURFACES_EXPORT TypeConverter<cc::SurfaceId, SurfaceIdPtr> {
+struct MOJO_CONVERTERS_EXPORT TypeConverter<cc::SurfaceId, SurfaceIdPtr> {
   static cc::SurfaceId Convert(const SurfaceIdPtr& input);
 };
 
 // Types from quads.mojom
 template <>
-struct MOJO_SURFACES_EXPORT TypeConverter<ColorPtr, SkColor> {
+struct MOJO_CONVERTERS_EXPORT TypeConverter<ColorPtr, SkColor> {
   static ColorPtr Convert(const SkColor& input);
 };
 template <>
-struct MOJO_SURFACES_EXPORT TypeConverter<SkColor, ColorPtr> {
+struct MOJO_CONVERTERS_EXPORT TypeConverter<SkColor, ColorPtr> {
   static SkColor Convert(const ColorPtr& input);
 };
 
 template <>
-struct MOJO_SURFACES_EXPORT TypeConverter<RenderPassIdPtr, cc::RenderPassId> {
+struct MOJO_CONVERTERS_EXPORT TypeConverter<RenderPassIdPtr, cc::RenderPassId> {
   static RenderPassIdPtr Convert(const cc::RenderPassId& input);
 };
 
 template <>
-struct MOJO_SURFACES_EXPORT TypeConverter<cc::RenderPassId, RenderPassIdPtr> {
+struct MOJO_CONVERTERS_EXPORT TypeConverter<cc::RenderPassId, RenderPassIdPtr> {
   static cc::RenderPassId Convert(const RenderPassIdPtr& input);
 };
 
 template <>
-struct MOJO_SURFACES_EXPORT TypeConverter<QuadPtr, cc::DrawQuad> {
+struct MOJO_CONVERTERS_EXPORT TypeConverter<QuadPtr, cc::DrawQuad> {
   static QuadPtr Convert(const cc::DrawQuad& input);
 };
 
 template <>
-struct MOJO_SURFACES_EXPORT
+struct MOJO_CONVERTERS_EXPORT
 TypeConverter<SharedQuadStatePtr, cc::SharedQuadState> {
   static SharedQuadStatePtr Convert(const cc::SharedQuadState& input);
 };
 
 template <>
-struct MOJO_SURFACES_EXPORT TypeConverter<PassPtr, cc::RenderPass> {
+struct MOJO_CONVERTERS_EXPORT TypeConverter<PassPtr, cc::RenderPass> {
   static PassPtr Convert(const cc::RenderPass& input);
 };
 
 template <>
-struct MOJO_SURFACES_EXPORT TypeConverter<scoped_ptr<cc::RenderPass>, PassPtr> {
+struct MOJO_CONVERTERS_EXPORT
+TypeConverter<scoped_ptr<cc::RenderPass>, PassPtr> {
   static scoped_ptr<cc::RenderPass> Convert(const PassPtr& input);
 };
 
 // Types from surfaces.mojom
 template <>
-struct MOJO_SURFACES_EXPORT TypeConverter<MailboxPtr, gpu::Mailbox> {
+struct MOJO_CONVERTERS_EXPORT TypeConverter<MailboxPtr, gpu::Mailbox> {
   static MailboxPtr Convert(const gpu::Mailbox& input);
 };
 template <>
-struct MOJO_SURFACES_EXPORT TypeConverter<gpu::Mailbox, MailboxPtr> {
+struct MOJO_CONVERTERS_EXPORT TypeConverter<gpu::Mailbox, MailboxPtr> {
   static gpu::Mailbox Convert(const MailboxPtr& input);
 };
 
 template <>
-struct MOJO_SURFACES_EXPORT
+struct MOJO_CONVERTERS_EXPORT
 TypeConverter<MailboxHolderPtr, gpu::MailboxHolder> {
   static MailboxHolderPtr Convert(const gpu::MailboxHolder& input);
 };
 template <>
-struct MOJO_SURFACES_EXPORT
+struct MOJO_CONVERTERS_EXPORT
 TypeConverter<gpu::MailboxHolder, MailboxHolderPtr> {
   static gpu::MailboxHolder Convert(const MailboxHolderPtr& input);
 };
 
 template <>
-struct MOJO_SURFACES_EXPORT
+struct MOJO_CONVERTERS_EXPORT
 TypeConverter<TransferableResourcePtr, cc::TransferableResource> {
   static TransferableResourcePtr Convert(const cc::TransferableResource& input);
 };
 template <>
-struct MOJO_SURFACES_EXPORT
+struct MOJO_CONVERTERS_EXPORT
 TypeConverter<cc::TransferableResource, TransferableResourcePtr> {
   static cc::TransferableResource Convert(const TransferableResourcePtr& input);
 };
 
 template <>
-struct MOJO_SURFACES_EXPORT
+struct MOJO_CONVERTERS_EXPORT
 TypeConverter<Array<TransferableResourcePtr>, cc::TransferableResourceArray> {
   static Array<TransferableResourcePtr> Convert(
       const cc::TransferableResourceArray& input);
 };
 template <>
-struct MOJO_SURFACES_EXPORT
+struct MOJO_CONVERTERS_EXPORT
 TypeConverter<cc::TransferableResourceArray, Array<TransferableResourcePtr> > {
   static cc::TransferableResourceArray Convert(
       const Array<TransferableResourcePtr>& input);
 };
 
 template <>
-struct MOJO_SURFACES_EXPORT
+struct MOJO_CONVERTERS_EXPORT
 TypeConverter<ReturnedResourcePtr, cc::ReturnedResource> {
   static ReturnedResourcePtr Convert(const cc::ReturnedResource& input);
 };
 template <>
-struct MOJO_SURFACES_EXPORT
+struct MOJO_CONVERTERS_EXPORT
 TypeConverter<cc::ReturnedResource, ReturnedResourcePtr> {
   static cc::ReturnedResource Convert(const ReturnedResourcePtr& input);
 };
 
 template <>
-struct MOJO_SURFACES_EXPORT
+struct MOJO_CONVERTERS_EXPORT
 TypeConverter<Array<ReturnedResourcePtr>, cc::ReturnedResourceArray> {
   static Array<ReturnedResourcePtr> Convert(
       const cc::ReturnedResourceArray& input);
 };
 
 template <>
-struct MOJO_SURFACES_EXPORT TypeConverter<FramePtr, cc::CompositorFrame> {
+struct MOJO_CONVERTERS_EXPORT TypeConverter<FramePtr, cc::CompositorFrame> {
   static FramePtr Convert(const cc::CompositorFrame& input);
 };
 
 template <>
-struct MOJO_SURFACES_EXPORT
+struct MOJO_CONVERTERS_EXPORT
 TypeConverter<scoped_ptr<cc::CompositorFrame>, FramePtr> {
   static scoped_ptr<cc::CompositorFrame> Convert(const FramePtr& input);
 };
 
 }  // namespace mojo
 
-#endif  // MOJO_SERVICES_PUBLIC_CPP_SURFACES_SURFACES_TYPE_CONVERTERS_H_
+#endif  // MOJO_CONVERTERS_SURFACES_TYPE_CONVERTERS_H_