Mojo C++ bindings: remove use_new_wrapper_types=false from all remaining targets im mojo/ folder.

mojo/edk/js/tests/js_to_cpp_tests.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 <string>
 #include <utility>
 
@@ skipping 86 matching lines @@
   args->ui64 = kExpectedUInt64Value;
   args->ui32 = kExpectedUInt32Value;
   args->ui16 = kExpectedUInt16Value;
   args->ui8 = kExpectedUInt8Value;
   args->float_val = kExpectedFloatVal;
   args->float_inf = kExpectedFloatInf;
   args->float_nan = kExpectedFloatNan;
   args->double_val = kExpectedDoubleVal;
   args->double_inf = kExpectedDoubleInf;
   args->double_nan = kExpectedDoubleNan;
-  args->name = "coming";
-  Array<String> string_array(3);
-  string_array[0] = "one";
-  string_array[1] = "two";
-  string_array[2] = "three";
-  args->string_array = std::move(string_array);
+  args->name.emplace("coming");
+  args->string_array.emplace(3);
+  (*args->string_array)[0] = "one";
+  (*args->string_array)[1] = "two";
+  (*args->string_array)[2] = "three";
   return args;
 }
 
 void CheckSampleEchoArgs(js_to_cpp::EchoArgsPtr arg) {
   EXPECT_EQ(kExpectedInt64Value, arg->si64);
   EXPECT_EQ(kExpectedInt32Value, arg->si32);
   EXPECT_EQ(kExpectedInt16Value, arg->si16);
   EXPECT_EQ(kExpectedInt8Value, arg->si8);
   EXPECT_EQ(kExpectedUInt64Value, arg->ui64);
   EXPECT_EQ(kExpectedUInt32Value, arg->ui32);
   EXPECT_EQ(kExpectedUInt16Value, arg->ui16);
   EXPECT_EQ(kExpectedUInt8Value, arg->ui8);
   EXPECT_EQ(kExpectedFloatVal, arg->float_val);
   EXPECT_EQ(kExpectedFloatInf, arg->float_inf);
   EXPECT_NAN(arg->float_nan);
   EXPECT_EQ(kExpectedDoubleVal, arg->double_val);
   EXPECT_EQ(kExpectedDoubleInf, arg->double_inf);
   EXPECT_NAN(arg->double_nan);
-  EXPECT_EQ(std::string("coming"), arg->name.get());
-  EXPECT_EQ(std::string("one"), arg->string_array[0].get());
-  EXPECT_EQ(std::string("two"), arg->string_array[1].get());
-  EXPECT_EQ(std::string("three"), arg->string_array[2].get());
+  EXPECT_EQ(std::string("coming"), *arg->name);
+  EXPECT_EQ(std::string("one"), (*arg->string_array)[0]);
+  EXPECT_EQ(std::string("two"), (*arg->string_array)[1]);
+  EXPECT_EQ(std::string("three"), (*arg->string_array)[2]);
   CheckDataPipe(std::move(arg->data_handle));
   CheckMessagePipe(arg->message_handle.get());
 }
 
 void CheckSampleEchoArgsList(const js_to_cpp::EchoArgsListPtr& list) {
   if (list.is_null())
     return;
   CheckSampleEchoArgs(std::move(list->item));
   CheckSampleEchoArgsList(list->next);
 }
 
 // More forgiving checks are needed in the face of potentially corrupt
 // messages. The values don't matter so long as all accesses are within
 // bounds.
-void CheckCorruptedString(const String& arg) {
-  if (arg.is_null())
-    return;
+void CheckCorruptedString(const std::string& arg) {
   for (size_t i = 0; i < arg.size(); ++i)
     g_waste_accumulator += arg[i];
 }
 
-void CheckCorruptedStringArray(const Array<String>& string_array) {
-  if (string_array.is_null())
+void CheckCorruptedString(const base::Optional<std::string>& arg) {
+  if (!arg)
     return;
-  for (size_t i = 0; i < string_array.size(); ++i)
-    CheckCorruptedString(string_array[i]);
+  CheckCorruptedString(*arg);
+}
+
+void CheckCorruptedStringArray(
+    const base::Optional<std::vector<std::string>>& string_array) {
+  if (!string_array)
+    return;
+  for (size_t i = 0; i < string_array->size(); ++i)
+    CheckCorruptedString((*string_array)[i]);
 }
 
 void CheckCorruptedDataPipe(MojoHandle data_pipe_handle) {
   unsigned char buffer[100];
   uint32_t buffer_size = static_cast<uint32_t>(sizeof(buffer));
   MojoResult result = MojoReadData(
       data_pipe_handle, buffer, &buffer_size, MOJO_READ_DATA_FLAG_NONE);
   if (result != MOJO_RESULT_OK)
     return;
   for (uint32_t i = 0; i < buffer_size; ++i)
@@ skipping 119 matching lines @@
     js_side_->Echo(kExpectedMessageCount, BuildSampleEchoArgs());
   }
 
   void EchoResponse(js_to_cpp::EchoArgsListPtr list) override {
     const js_to_cpp::EchoArgsPtr& special_arg = list->item;
     message_count_ += 1;
     EXPECT_EQ(-1, special_arg->si64);
     EXPECT_EQ(-1, special_arg->si32);
     EXPECT_EQ(-1, special_arg->si16);
     EXPECT_EQ(-1, special_arg->si8);
-    EXPECT_EQ(std::string("going"), special_arg->name.To<std::string>());
+    EXPECT_EQ(std::string("going"), *special_arg->name);
     CheckSampleEchoArgsList(list->next);
   }
 
   void TestFinished() override {
     termination_seen_ = true;
     run_loop()->Quit();
   }
 
   bool DidSucceed() {
     return termination_seen_ &&
@@ skipping 125 matching lines @@
 
 TEST_F(JsToCppTest, BackPointer) {
   BackPointerCppSideConnection cpp_side_connection;
   RunTest("mojo/edk/js/tests/js_to_cpp_tests", &cpp_side_connection);
   EXPECT_TRUE(cpp_side_connection.DidSucceed());
 }
 
 }  // namespace js
 }  // namespace edk
 }  // namespace mojo