Move string16 and char16 in to base::

minidump/minidump_string_writer_test.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 28 matching lines @@
   {
     SCOPED_TRACE("unset");
     file_writer.Reset();
     crashpad::internal::MinidumpUTF16StringWriter string_writer;
     EXPECT_TRUE(string_writer.WriteEverything(&file_writer));
     ASSERT_EQ(6u, file_writer.string().size());
 
     const MINIDUMP_STRING* minidump_string =
         MinidumpStringAtRVA(file_writer.string(), 0);
     EXPECT_TRUE(minidump_string);
-    EXPECT_EQ(string16(), MinidumpStringAtRVAAsString(file_writer.string(), 0));
+    EXPECT_EQ(base::string16(),
+              MinidumpStringAtRVAAsString(file_writer.string(), 0));
   }
 
   const struct {
     size_t input_length;
     const char* input_string;
     size_t output_length;
-    const char16 output_string[10];
+    const base::char16 output_string[10];
   } kTestData[] = {
       {0, "", 0, {}},
       {1, "a", 1, {'a'}},
       {2, "\0b", 2, {0, 'b'}},
       {3, "cde", 3, {'c', 'd', 'e'}},
       {9, "Hi world!", 9, {'H', 'i', ' ', 'w', 'o', 'r', 'l', 'd', '!'}},
       {7, "ret\nurn", 7, {'r', 'e', 't', '\n', 'u', 'r', 'n'}},
       {2, "\303\251", 1, {0x00e9}},  // é
 
       // oóöőo
@@ skipping 21 matching lines @@
     const size_t expected_utf16_units_with_nul =
         kTestData[index].output_length + 1;
     const size_t expected_utf16_bytes =
         expected_utf16_units_with_nul * sizeof(MINIDUMP_STRING::Buffer[0]);
     ASSERT_EQ(sizeof(MINIDUMP_STRING) + expected_utf16_bytes,
               file_writer.string().size());
 
     const MINIDUMP_STRING* minidump_string =
         MinidumpStringAtRVA(file_writer.string(), 0);
     EXPECT_TRUE(minidump_string);
-    string16 expect_string = string16(kTestData[index].output_string,
-                                      kTestData[index].output_length);
+    base::string16 expect_string = base::string16(
+        kTestData[index].output_string, kTestData[index].output_length);
     EXPECT_EQ(expect_string,
               MinidumpStringAtRVAAsString(file_writer.string(), 0));
   }
 }
 
 TEST(MinidumpStringWriter, ConvertInvalidUTF8ToUTF16) {
   StringFileWriter file_writer;
 
   const char* kTestData[] = {
       "\200",  // continuation byte
@@ skipping 16 matching lines @@
     // that at least enough data was written for a string that has one unit and
     // a NUL terminator, make sure that the length field matches the length of
     // data written, and make sure that at least one U+FFFD replacement
     // character was written.
     const MINIDUMP_STRING* minidump_string =
         MinidumpStringAtRVA(file_writer.string(), 0);
     EXPECT_TRUE(minidump_string);
     EXPECT_EQ(file_writer.string().size() - sizeof(MINIDUMP_STRING) -
                   sizeof(MINIDUMP_STRING::Buffer[0]),
               minidump_string->Length);
-    string16 output_string =
+    base::string16 output_string =
         MinidumpStringAtRVAAsString(file_writer.string(), 0);
     EXPECT_FALSE(output_string.empty());
-    EXPECT_NE(string16::npos, output_string.find(0xfffd));
+    EXPECT_NE(base::string16::npos, output_string.find(0xfffd));
   }
 }
 
 TEST(MinidumpStringWriter, MinidumpUTF8StringWriter) {
   StringFileWriter file_writer;
 
   {
     SCOPED_TRACE("unset");
     file_writer.Reset();
     crashpad::internal::MinidumpUTF8StringWriter string_writer;
@@ skipping 42 matching lines @@
     const MinidumpUTF8String* minidump_string =
         MinidumpUTF8StringAtRVA(file_writer.string(), 0);
     EXPECT_TRUE(minidump_string);
     EXPECT_EQ(test_string,
               MinidumpUTF8StringAtRVAAsString(file_writer.string(), 0));
   }
 }
 
 struct MinidumpUTF16StringListWriterTraits {
   using MinidumpStringListWriterType = MinidumpUTF16StringListWriter;
-  static string16 ExpectationForUTF8(const std::string& utf8) {
+  static base::string16 ExpectationForUTF8(const std::string& utf8) {
     return base::UTF8ToUTF16(utf8);
   }
-  static string16 ObservationAtRVA(const std::string& file_contents, RVA rva) {
+  static base::string16 ObservationAtRVA(const std::string& file_contents,
+                                         RVA rva) {
     return MinidumpStringAtRVAAsString(file_contents, rva);
   }
 };
 
 struct MinidumpUTF8StringListWriterTraits {
   using MinidumpStringListWriterType = MinidumpUTF8StringListWriter;
   static std::string ExpectationForUTF8(const std::string& utf8) {
     return utf8;
   }
   static std::string ObservationAtRVA(const std::string& file_contents,
@@ skipping 34 matching lines @@
   MinidumpStringListTest<MinidumpUTF16StringListWriterTraits>();
 }
 
 TEST(MinidumpStringWriter, MinidumpUTF8StringList) {
   MinidumpStringListTest<MinidumpUTF8StringListWriterTraits>();
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad