Remove mojo::String.

mojo/public/cpp/bindings/tests/array_common_test.h

 // Copyright 2016 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 "mojo/public/cpp/bindings/lib/array_internal.h"
 #include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
@@ skipping 91 matching lines @@
         array[i] = static_cast<int32_t>(i);
 
       ArrayType<int32_t> clone_array = array.Clone();
       EXPECT_EQ(array.size(), clone_array.size());
       for (size_t i = 0; i < array.size(); ++i)
         EXPECT_EQ(array[i], clone_array[i]);
     }
 
     {
       // Test copyable object.
-      ArrayType<String> array(2);
+      ArrayType<std::string> array(2);
       array[0] = "hello";
       array[1] = "world";
 
-      ArrayType<String> clone_array = array.Clone();
+      ArrayType<std::string> clone_array = array.Clone();
       EXPECT_EQ(array.size(), clone_array.size());
       for (size_t i = 0; i < array.size(); ++i)
         EXPECT_EQ(array[i], clone_array[i]);
     }
 
     {
       // Test struct.
       ArrayType<RectPtr> array(2);
       array[1] = Rect::New();
       array[1]->x = 1;
@@ skipping 125 matching lines @@
     ArrayType<bool> array2;
     mojo::internal::Deserialize<ArrayDataView<bool>>(data, &array2, nullptr);
 
     EXPECT_EQ(10U, array2.size());
     for (size_t i = 0; i < array2.size(); ++i)
       EXPECT_EQ(i % 2 ? true : false, array2[i]);
   }
 
   static void Serialization_ArrayOfString() {
     using MojomType = ArrayDataView<StringDataView>;
-    ArrayType<String> array(10);
+    ArrayType<std::string> array(10);
     for (size_t i = 0; i < array.size(); ++i) {
       char c = 'A' + static_cast<char>(i);
-      array[i] = String(&c, 1);
+      array[i] = std::string(&c, 1);
     }
 
     size_t size = mojo::internal::PrepareToSerialize<MojomType>(array, nullptr);
     EXPECT_EQ(8U +            // array header
                   10 * 8U +   // array payload (10 pointers)
                   10 * (8U +  // string header
                         8U),  // string length of 1 padded to 8
               size);
 
     mojo::internal::FixedBufferForTesting buf(size);
     typename mojo::internal::MojomTypeTraits<MojomType>::Data* data;
     mojo::internal::ContainerValidateParams validate_params(
         0, false,
         new mojo::internal::ContainerValidateParams(0, false, nullptr));
     mojo::internal::Serialize<MojomType>(array, &buf, &data, &validate_params,
                                          nullptr);
 
-    ArrayType<String> array2;
+    ArrayType<std::string> array2;
     mojo::internal::Deserialize<MojomType>(data, &array2, nullptr);
 
     EXPECT_EQ(10U, array2.size());
     for (size_t i = 0; i < array2.size(); ++i) {
       char c = 'A' + static_cast<char>(i);
-      EXPECT_EQ(String(&c, 1), array2[i]);
+      EXPECT_EQ(std::string(&c, 1), array2[i]);
     }
   }
 
   static void Resize_Copyable() {
     ASSERT_EQ(0u, CopyableType::num_instances());
     ArrayType<CopyableType> array(3);
     std::vector<CopyableType*> value_ptrs;
     value_ptrs.push_back(array[0].ptr());
     value_ptrs.push_back(array[1].ptr());
 
@@ skipping 95 matching lines @@
   }
 };
 
 #define ARRAY_COMMON_TEST(ArrayType, test_name) \
   TEST_F(ArrayType##Test, test_name) {          \
     ArrayCommonTest<ArrayType>::test_name();    \
   }
 
 }  // namespace test
 }  // namespace mojo