Remove mojo::String.

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

Index: mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc b/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc
index 2638a9d1c55734b67d4f872ba770c4be858a1839..a91a5c5d50186ac7794f9ea2917812197a3ce691 100644
--- a/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc
@@ -13,7 +13,6 @@
 #include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
 #include "mojo/public/cpp/bindings/lib/serialization.h"
 #include "mojo/public/cpp/bindings/lib/validation_errors.h"
-#include "mojo/public/cpp/bindings/string.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom.h"
 #include "mojo/public/interfaces/bindings/tests/test_unions.mojom.h"
@@ -191,7 +190,7 @@ TEST_F(SerializationWarningTest, ArrayOfArraysOfHandles) {
 TEST_F(SerializationWarningTest, ArrayOfStrings) {
   using MojomType = ArrayDataView<StringDataView>;
 
-  Array<String> test_array(3);
+  Array<std::string> test_array(3);
   for (size_t i = 0; i < test_array.size(); ++i)
     test_array[i] = "hello";
 
@@ -201,17 +200,17 @@ TEST_F(SerializationWarningTest, ArrayOfStrings) {
                               mojo::internal::VALIDATION_ERROR_NONE,
                               &validate_params_0);
 
-  test_array = Array<String>(3);
-  for (size_t i = 0; i < test_array.size(); ++i)
-    test_array[i] = nullptr;
+  Array<base::Optional<std::string>> optional_test_array(3);
+  for (size_t i = 0; i < optional_test_array.size(); ++i)
+    optional_test_array[i] = base::nullopt;

[yzshen1, 2017/01/04 00:05:35]

They are nullopt by default, right?

[Sam McNally, 2017/01/04 00:28:25]

Done.

   ContainerValidateParams validate_params_1(
       0, false, new ContainerValidateParams(0, false, nullptr));
   TestArrayWarning<MojomType>(
-      std::move(test_array),
+      std::move(optional_test_array),
       mojo::internal::VALIDATION_ERROR_UNEXPECTED_NULL_POINTER,
       &validate_params_1);
 
-  test_array = Array<String>(2);
+  test_array = Array<std::string>(2);
   ContainerValidateParams validate_params_2(
       3, true, new ContainerValidateParams(0, false, nullptr));
   TestArrayWarning<MojomType>(