Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / mojo / common / common_type_converters.h

diff --git a/src/mojo/common/common_type_converters.h b/src/mojo/common/common_type_converters.h
index 5437ec4..a43d18b 100644 (file)
--- a/src/mojo/common/common_type_converters.h
+++ b/src/mojo/common/common_type_converters.h
@@ -8,8 +8,8 @@
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "mojo/common/mojo_common_export.h"
-#include "mojo/public/bindings/array.h"
-#include "mojo/public/bindings/type_converter.h"
+#include "mojo/public/cpp/bindings/array.h"
+#include "mojo/public/cpp/bindings/type_converter.h"
 
 namespace mojo {
 
@@ -18,6 +18,8 @@ class MOJO_COMMON_EXPORT TypeConverter<String, base::StringPiece> {
  public:
   static String ConvertFrom(const base::StringPiece& input, Buffer* buf);
   static base::StringPiece ConvertTo(const String& input);
+
+  MOJO_ALLOW_IMPLICIT_TYPE_CONVERSION();
 };
 
 template <>
@@ -25,6 +27,8 @@ class MOJO_COMMON_EXPORT TypeConverter<String, base::string16> {
  public:
   static String ConvertFrom(const base::string16& input, Buffer* buf);
   static base::string16 ConvertTo(const String& input);
+
+  MOJO_ALLOW_IMPLICIT_TYPE_CONVERSION();
 };
 
 }  // namespace mojo