Upstream version 10.39.225.0

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

diff --git a/src/mojo/common/common_type_converters.cc b/src/mojo/common/common_type_converters.cc
index f02be67..114b409 100644 (file)
--- a/src/mojo/common/common_type_converters.cc
+++ b/src/mojo/common/common_type_converters.cc
@@ -4,21 +4,62 @@
 
 #include "mojo/common/common_type_converters.h"
 
+#include <string>
+
+#include "base/strings/utf_string_conversions.h"
+#include "url/gurl.h"
+
 namespace mojo {
 
 // static
-String TypeConverter<String, base::StringPiece>::ConvertFrom(
-    const base::StringPiece& input,
-    Buffer* buf) {
-  String::Builder result(input.size(), buf);
-  memcpy(&result[0], input.data(), input.size());
-  return result.Finish();
+String TypeConverter<String, base::StringPiece>::Convert(
+    const base::StringPiece& input) {
+  if (input.empty()) {
+    char c = 0;
+    return String(&c, 0);
+  }
+  return String(input.data(), input.size());
 }
 // static
-base::StringPiece TypeConverter<String, base::StringPiece>::ConvertTo(
+base::StringPiece TypeConverter<base::StringPiece, String>::Convert(
     const String& input) {
-  return input.is_null() ? base::StringPiece() :
-                           base::StringPiece(&input[0], input.size());
+  return input.get();
+}
+
+// static
+String TypeConverter<String, base::string16>::Convert(
+    const base::string16& input) {
+  return TypeConverter<String, base::StringPiece>::Convert(
+      base::UTF16ToUTF8(input));
+}
+// static
+base::string16 TypeConverter<base::string16, String>::Convert(
+    const String& input) {
+  return base::UTF8ToUTF16(input.To<base::StringPiece>());
+}
+
+String TypeConverter<String, GURL>::Convert(const GURL& input) {
+  return String(input.spec());
+}
+
+GURL TypeConverter<GURL, String>::Convert(const String& input) {
+  return GURL(input.get());
+}
+
+std::string TypeConverter<std::string, Array<uint8_t> >::Convert(
+    const Array<uint8_t>& input) {
+  if (input.is_null())
+    return std::string();
+
+  return std::string(reinterpret_cast<const char*>(&input.front()),
+                     input.size());
+}
+
+Array<uint8_t> TypeConverter<Array<uint8_t>, std::string>::Convert(
+    const std::string& input) {
+  Array<uint8_t> result(input.size());
+  memcpy(&result.front(), input.c_str(), input.size());
+  return result.Pass();
 }
 
 }  // namespace mojo