Mojo: SimilarityTraits -> TypeConverter

Also Copy{From,To} -> Convert{From,To}.

R=abarth@chromium.org

Review URL: https://codereview.chromium.org/101743003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239379 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 12 insertions, 12 deletions

diff --git a/mojo/common/common_similarity_traits.cc b/mojo/common/common_type_converters.cc
index 26bd20c..f02be67 100644
--- a/mojo/common/common_similarity_traits.cc
+++ b/mojo/common/common_type_converters.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/common/common_similarity_traits.h"
+#include "mojo/common/common_type_converters.h"
 
 namespace mojo {
 
 // static
-String SimilarityTraits<String, base::StringPiece>::CopyFrom(
+String TypeConverter<String, base::StringPiece>::ConvertFrom(
     const base::StringPiece& input,
     Buffer* buf) {
   String::Builder result(input.size(), buf);
@@ -15,7 +15,7 @@ String SimilarityTraits<String, base::StringPiece>::CopyFrom(
   return result.Finish();
 }
 // static
-base::StringPiece SimilarityTraits<String, base::StringPiece>::CopyTo(
+base::StringPiece TypeConverter<String, base::StringPiece>::ConvertTo(
     const String& input) {
   return input.is_null() ? base::StringPiece() :
                            base::StringPiece(&input[0], input.size());
diff --git a/mojo/common/common_similarity_traits.h b/mojo/common/common_type_converters.h
index 7665517..1ff5787 100644
--- a/mojo/common/common_similarity_traits.h
+++ b/mojo/common/common_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_COMMON_COMMON_SIMILARITY_TRAITS_H_
-#define MOJO_COMMON_COMMON_SIMILARITY_TRAITS_H_
+#ifndef MOJO_COMMON_COMMON_TYPE_CONVERTERS_H_
+#define MOJO_COMMON_COMMON_TYPE_CONVERTERS_H_
 
 #include "base/strings/string_piece.h"
 #include "mojo/common/mojo_common_export.h"
@@ -12,12 +12,12 @@
 namespace mojo {
 
 template <>
-class MOJO_COMMON_EXPORT SimilarityTraits<String, base::StringPiece> {
+class MOJO_COMMON_EXPORT TypeConverter<String, base::StringPiece> {
  public:
-  static String CopyFrom(const base::StringPiece& input, Buffer* buf);
-  static base::StringPiece CopyTo(const String& input);
+  static String ConvertFrom(const base::StringPiece& input, Buffer* buf);
+  static base::StringPiece ConvertTo(const String& input);
 };
 
 }  // namespace mojo
 
-#endif  // MOJO_COMMON_COMMON_SIMILARITY_TRAITS_H_
+#endif  // MOJO_COMMON_COMMON_TYPE_CONVERTERS_H_
diff --git a/mojo/common/common_similarity_traits_unittest.cc b/mojo/common/common_type_converters_unittest.cc
index 28df65d..96a814e9 100644
--- a/mojo/common/common_similarity_traits_unittest.cc
+++ b/mojo/common/common_type_converters_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/common/common_similarity_traits.h"
+#include "mojo/common/common_type_converters.h"
 #include "mojo/public/tests/simple_bindings_support.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -22,12 +22,12 @@ void ExpectEqualsMojoString(const std::string& expected,
 
 }  // namespace
 
-class CommonSimilarityTraitsTest : public testing::Test {
+class CommonTypeConvertersTest : public testing::Test {
  private:
   SimpleBindingsSupport bindings_support_;
 };
 
-TEST_F(CommonSimilarityTraitsTest, StringPiece) {
+TEST_F(CommonTypeConvertersTest, StringPiece) {
   AllocationScope scope;
 
   std::string kText("hello world");