Move string16 and char16 in to base::

minidump/test/minidump_writable_test_util.cc

Index: minidump/test/minidump_writable_test_util.cc
diff --git a/minidump/test/minidump_writable_test_util.cc b/minidump/test/minidump_writable_test_util.cc
index 4ebd7f08cce7a94abcc81e7251e16f743622d9c5..b2ea242a3859af6957ee109eba8682f5bd95447a 100644
--- a/minidump/test/minidump_writable_test_util.cc
+++ b/minidump/test/minidump_writable_test_util.cc
@@ -110,14 +110,16 @@ const IMAGE_DEBUG_MISC* MinidumpWritableAtLocationDescriptor<IMAGE_DEBUG_MISC>(
       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;