Mojo: more idiomatic C++ bindings

mojo/common/common_type_converters_unittest.cc

Index: mojo/common/common_type_converters_unittest.cc
diff --git a/mojo/common/common_type_converters_unittest.cc b/mojo/common/common_type_converters_unittest.cc
index 438d1e76aa99823cc8b46a87d6c69bc237326d83..47771393260f71ec5e64a5d3376abe0885ad3f82 100644
--- a/mojo/common/common_type_converters_unittest.cc
+++ b/mojo/common/common_type_converters_unittest.cc
@@ -5,7 +5,6 @@
 #include "mojo/common/common_type_converters.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
@@ -20,7 +19,7 @@ void ExpectEqualsStringPiece(const std::string& expected,
 
 void ExpectEqualsMojoString(const std::string& expected,
                             const String& str) {
-  EXPECT_EQ(expected, str.To<std::string>());
+  EXPECT_EQ(expected, str.get());
 }
 
 void ExpectEqualsString16(const base::string16& expected,
@@ -36,40 +35,36 @@ void ExpectEqualsMojoString(const base::string16& expected,
 }  // namespace
 
 TEST(CommonTypeConvertersTest, StringPiece) {
-  AllocationScope scope;
-
   std::string kText("hello world");
 
   base::StringPiece string_piece(kText);
-  String mojo_string(string_piece);
+  String mojo_string(String::From(string_piece));
 
   ExpectEqualsMojoString(kText, mojo_string);
   ExpectEqualsStringPiece(kText, mojo_string.To<base::StringPiece>());
 
   // Test implicit construction and conversion:
-  ExpectEqualsMojoString(kText, string_piece);
-  ExpectEqualsStringPiece(kText, mojo_string);
+  ExpectEqualsMojoString(kText, String::From(string_piece));
+  ExpectEqualsStringPiece(kText, mojo_string.To<base::StringPiece>());
 
   // Test null String:
-  base::StringPiece empty_string_piece = String();
+  base::StringPiece empty_string_piece = String().To<base::StringPiece>();
   EXPECT_TRUE(empty_string_piece.empty());
 }
 
 TEST(CommonTypeConvertersTest, String16) {
-  AllocationScope scope;
-
   const base::string16 string16(base::ASCIIToUTF16("hello world"));
-  const String mojo_string(string16);
+  const String mojo_string(String::From(string16));
 
   ExpectEqualsMojoString(string16, mojo_string);
   EXPECT_EQ(string16, mojo_string.To<base::string16>());
 
   // Test implicit construction and conversion:
-  ExpectEqualsMojoString(string16, string16);
-  ExpectEqualsString16(string16, mojo_string);
+  ExpectEqualsMojoString(string16, String::From(string16));
+  ExpectEqualsString16(string16, mojo_string.To<base::string16>());
 
   // Test empty string conversion.
-  ExpectEqualsMojoString(base::string16(), base::string16());
+  ExpectEqualsMojoString(base::string16(), String::From(base::string16()));
 }
 
 }  // namespace test