Move string16 and char16 in to base::

minidump/minidump_module_writer_test.cc

Index: minidump/minidump_module_writer_test.cc
diff --git a/minidump/minidump_module_writer_test.cc b/minidump/minidump_module_writer_test.cc
index af2eeee3e8e98c24555bfd6cea6861b5a9f13e37..514d49c6180e539f122f2a8b834ccbe01c7e7ae8 100644
--- a/minidump/minidump_module_writer_test.cc
+++ b/minidump/minidump_module_writer_test.cc
@@ -172,9 +172,9 @@ void ExpectMiscellaneousDebugRecord(
 
     size_t bytes_used;
     if (misc_debug_record->Unicode) {
-      string16 observed_data_utf16(
-          reinterpret_cast<const char16*>(misc_debug_record->Data));
-      bytes_used = (observed_data_utf16.size() + 1) * sizeof(char16);
+      base::string16 observed_data_utf16(
+          reinterpret_cast<const base::char16*>(misc_debug_record->Data));
+      bytes_used = (observed_data_utf16.size() + 1) * sizeof(base::char16);
       observed_data = base::UTF16ToUTF8(observed_data_utf16);
     } else {
       observed_data = reinterpret_cast<const char*>(misc_debug_record->Data);
@@ -247,9 +247,10 @@ void ExpectModule(const MINIDUMP_MODULE* expected,
   EXPECT_EQ(0u, observed->Reserved1);
 
   EXPECT_NE(0u, observed->ModuleNameRva);
-  string16 observed_module_name_utf16 =
+  base::string16 observed_module_name_utf16 =
       MinidumpStringAtRVAAsString(file_contents, observed->ModuleNameRva);
-  string16 expected_module_name_utf16 = base::UTF8ToUTF16(expected_module_name);
+  base::string16 expected_module_name_utf16 =
+      base::UTF8ToUTF16(expected_module_name);
   EXPECT_EQ(expected_module_name_utf16, observed_module_name_utf16);
 
   ASSERT_NO_FATAL_FAILURE(ExpectCodeViewRecord(&observed->CvRecord,