Move string16 and char16 in to base::

minidump/test/minidump_writable_test_util.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 92 matching lines @@
     return nullptr;
   }
 
   if (misc->Unicode == 0) {
     size_t string_length = misc->Length - offsetof(IMAGE_DEBUG_MISC, Data) - 1;
     if (misc->Data[string_length] != '\0') {
       EXPECT_EQ('\0', misc->Data[string_length]);
       return nullptr;
     }
   } else if (misc->Unicode == 1) {
-    if (misc->Length % sizeof(char16) != 0) {
-      EXPECT_EQ(0u, misc->Length % sizeof(char16));
+    if (misc->Length % sizeof(base::char16) != 0) {
+      EXPECT_EQ(0u, misc->Length % sizeof(base::char16));
       return nullptr;
     }
 
-    size_t string_length =
-        (misc->Length - offsetof(IMAGE_DEBUG_MISC, Data)) / sizeof(char16) - 1;
-    const char16* data16 = reinterpret_cast<const char16*>(misc->Data);
+    size_t string_length = (misc->Length - offsetof(IMAGE_DEBUG_MISC, Data)) /
+                               sizeof(base::char16) -
+                           1;
+    const base::char16* data16 =
+        reinterpret_cast<const base::char16*>(misc->Data);
     if (data16[string_length] != '\0') {
       EXPECT_EQ('\0', data16[string_length]);
       return nullptr;
     }
   } else {
     ADD_FAILURE() << "misc->Unicode " << misc->Unicode;
     return nullptr;
   }
 
   return misc;
@@ skipping 187 matching lines @@
 size_t TestUInt32MinidumpWritable::SizeOfObject() {
   return sizeof(value_);
 }
 
 bool TestUInt32MinidumpWritable::WriteObject(FileWriterInterface* file_writer) {
   return file_writer->Write(&value_, sizeof(value_));
 }
 
 }  // namespace test
 }  // namespace crashpad