Remove mojo::String.

mojo/public/cpp/bindings/tests/serialization_warning_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.
 
 // Serialization warnings are only recorded when DLOG is enabled.
 #if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
 
 #include <stddef.h>
 #include <utility>
 
 #include "mojo/public/cpp/bindings/array.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_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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 namespace {
 
 using mojo::internal::ContainerValidateParams;
@@ skipping 157 matching lines @@
       0, true, new ContainerValidateParams(0, false, nullptr));
   TestArrayWarning<MojomType>(
       std::move(test_array),
       mojo::internal::VALIDATION_ERROR_UNEXPECTED_INVALID_HANDLE,
       &validate_params_2);
 }
 
 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";
 
   ContainerValidateParams validate_params_0(
       0, true, new ContainerValidateParams(0, false, nullptr));
   TestArrayWarning<MojomType>(std::move(test_array),
                               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>(
       std::move(test_array),
       mojo::internal::VALIDATION_ERROR_UNEXPECTED_ARRAY_HEADER,
       &validate_params_2);
 }
 
 TEST_F(SerializationWarningTest, StructInUnion) {
   DummyStructPtr dummy(nullptr);
@@ skipping 20 matching lines @@
 
   TestUnionWarning(std::move(handle),
                    mojo::internal::VALIDATION_ERROR_UNEXPECTED_INVALID_HANDLE);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo
 
 #endif