| Index: mojo/common/common_type_converters.h
|
| diff --git a/mojo/common/common_type_converters.h b/mojo/common/common_type_converters.h
|
| index a43d18b5fe49a7b8c6a7f8a3fdb8eb6655478224..a75e734a9f169e4cb4e84b439a4ef21245690d45 100644
|
| --- a/mojo/common/common_type_converters.h
|
| +++ b/mojo/common/common_type_converters.h
|
| @@ -8,7 +8,7 @@
|
| #include "base/strings/string16.h"
|
| #include "base/strings/string_piece.h"
|
| #include "mojo/common/mojo_common_export.h"
|
| -#include "mojo/public/cpp/bindings/array.h"
|
| +#include "mojo/public/cpp/bindings/string.h"
|
| #include "mojo/public/cpp/bindings/type_converter.h"
|
|
|
| namespace mojo {
|
| @@ -16,19 +16,15 @@ namespace mojo {
|
| template <>
|
| class MOJO_COMMON_EXPORT TypeConverter<String, base::StringPiece> {
|
| public:
|
| - static String ConvertFrom(const base::StringPiece& input, Buffer* buf);
|
| + static String ConvertFrom(const base::StringPiece& input);
|
| static base::StringPiece ConvertTo(const String& input);
|
| -
|
| - MOJO_ALLOW_IMPLICIT_TYPE_CONVERSION();
|
| };
|
|
|
| template <>
|
| class MOJO_COMMON_EXPORT TypeConverter<String, base::string16> {
|
| public:
|
| - static String ConvertFrom(const base::string16& input, Buffer* buf);
|
| + static String ConvertFrom(const base::string16& input);
|
| static base::string16 ConvertTo(const String& input);
|
| -
|
| - MOJO_ALLOW_IMPLICIT_TYPE_CONVERSION();
|
| };
|
|
|
| } // namespace mojo
|
|
|