Remove mojo::String.

mojo/public/cpp/bindings/tests/union_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/lib/array_internal.h"
 #include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
 #include "mojo/public/cpp/bindings/lib/serialization.h"
 #include "mojo/public/cpp/bindings/lib/validation_context.h"
 #include "mojo/public/cpp/bindings/lib/validation_errors.h"
-#include "mojo/public/cpp/bindings/string.h"
 #include "mojo/public/cpp/test_support/test_utils.h"
 #include "mojo/public/interfaces/bindings/tests/test_structs.mojom.h"
 #include "mojo/public/interfaces/bindings/tests/test_unions.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 
 TEST(UnionTest, PlainOldDataGetterSetter) {
   PodUnionPtr pod(PodUnion::New());
@@ skipping 278 matching lines @@
   mojo::internal::ValidationContext validation_context(
       data, static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(
       internal::PodUnion_Data::Validate(raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, StringGetterSetter) {
   ObjectUnionPtr pod(ObjectUnion::New());
 
-  String hello("hello world");
+  std::string hello("hello world");
   pod->set_f_string(hello);
   EXPECT_EQ(hello, pod->get_f_string());
   EXPECT_TRUE(pod->is_f_string());
   EXPECT_EQ(pod->which(), ObjectUnion::Tag::F_STRING);
 }
 
 TEST(UnionTest, StringEquals) {
   ObjectUnionPtr pod1(ObjectUnion::New());
   ObjectUnionPtr pod2(ObjectUnion::New());
 
   pod1->set_f_string("hello world");
   pod2->set_f_string("hello world");
   EXPECT_TRUE(pod1.Equals(pod2));
 
   pod2->set_f_string("hello universe");
   EXPECT_FALSE(pod1.Equals(pod2));
 }
 
 TEST(UnionTest, StringClone) {
   ObjectUnionPtr pod(ObjectUnion::New());
 
-  String hello("hello world");
+  std::string hello("hello world");
   pod->set_f_string(hello);
   ObjectUnionPtr pod_clone = pod.Clone();
   EXPECT_EQ(hello, pod_clone->get_f_string());
   EXPECT_TRUE(pod_clone->is_f_string());
   EXPECT_EQ(pod_clone->which(), ObjectUnion::Tag::F_STRING);
 }
 
 TEST(UnionTest, StringSerialization) {
   ObjectUnionPtr pod1(ObjectUnion::New());
 
-  String hello("hello world");
+  std::string hello("hello world");
   pod1->set_f_string(hello);
 
   size_t size = mojo::internal::PrepareToSerialize<ObjectUnionDataView>(
       pod1, false, nullptr);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
   mojo::internal::Serialize<ObjectUnionDataView>(pod1, &buf, &data, false,
                                                  nullptr);
 
   ObjectUnionPtr pod2;
@@ skipping 158 matching lines @@
       data, static_cast<uint32_t>(size), 0);
   ASSERT_TRUE(mojo::internal::Array_Data<internal::ObjectUnion_Data>::Validate(
       data, &validation_context, &validate_params));
 
   Array<ObjectUnionPtr> array2;
   mojo::internal::Deserialize<ArrayDataView<ObjectUnionDataView>>(data, &array2,
                                                                   nullptr);
 
   EXPECT_EQ(2U, array2.size());
 
-  EXPECT_EQ(String("hello"), array2[0]->get_f_string());
-  EXPECT_EQ(String("world"), array2[1]->get_f_string());
+  EXPECT_EQ("hello", array2[0]->get_f_string());
+  EXPECT_EQ("world", array2[1]->get_f_string());
 }
 
 // TODO(azani): Move back in struct_unittest.cc when possible.
 // Struct tests
 TEST(UnionTest, Clone_Union) {
   SmallStructPtr small_struct(SmallStruct::New());
   small_struct->pod_union = PodUnion::New();
   small_struct->pod_union->set_f_int8(10);
 
   SmallStructPtr clone = small_struct.Clone();
@@ skipping 19 matching lines @@
   mojo::internal::Deserialize<SmallStructDataView>(data, &deserialized,
                                                    &context);
 
   EXPECT_EQ(10, deserialized->pod_union->get_f_int32());
 }
 
 // Serialization test of a struct with a union of structs.
 TEST(UnionTest, Serialization_UnionOfObjects) {
   SmallObjStructPtr obj_struct(SmallObjStruct::New());
   obj_struct->obj_union = ObjectUnion::New();
-  String hello("hello world");
+  std::string hello("hello world");
   obj_struct->obj_union->set_f_string(hello);
 
   size_t size = mojo::internal::PrepareToSerialize<SmallObjStructDataView>(
       obj_struct, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallObjStruct_Data* data = nullptr;
   mojo::internal::Serialize<SmallObjStructDataView>(obj_struct, &buf, &data,
                                                     nullptr);
 
@@ skipping 657 matching lines @@
 
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int16(16);
 
   ptr->Echo(std::move(pod), base::Bind(&ExpectInt16, 16));
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace test
 }  // namespace mojo