Move string16 and char16 in to base::

minidump/minidump_module_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 154 matching lines @@
 
     // Check for the NUL terminator.
     size_t bytes_available =
         misc_debug_record->Length - offsetof(IMAGE_DEBUG_MISC, Data);
     EXPECT_EQ('\0', misc_debug_record->Data[bytes_available - 1]);
     std::string observed_data(
         reinterpret_cast<const char*>(misc_debug_record->Data));
 
     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);
       bytes_used = (observed_data.size() + 1) * sizeof(char);
     }
     EXPECT_LE(bytes_used, bytes_available);
 
     // Make sure that any padding bytes after the first NUL are also NUL.
     for (size_t index = bytes_used; index < bytes_available; ++index) {
       EXPECT_EQ('\0', misc_debug_record->Data[index]);
@@ skipping 52 matching lines @@
   EXPECT_EQ(expected->VersionInfo.dwFileSubtype,
             observed->VersionInfo.dwFileSubtype);
   EXPECT_EQ(expected->VersionInfo.dwFileDateMS,
             observed->VersionInfo.dwFileDateMS);
   EXPECT_EQ(expected->VersionInfo.dwFileDateLS,
             observed->VersionInfo.dwFileDateLS);
   EXPECT_EQ(0u, observed->Reserved0);
   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,
                                                file_contents,
                                                expected_pdb_name,
                                                expected_pdb_uuid,
                                                expected_pdb_timestamp,
                                                expected_pdb_age));
 
   ASSERT_NO_FATAL_FAILURE(ExpectMiscellaneousDebugRecord(&observed->MiscRecord,
@@ skipping 485 matching lines @@
   module_list_writer->AddModule(module_writer.Pass());
   minidump_file_writer.AddStream(module_list_writer.Pass());
 
   StringFileWriter file_writer;
   ASSERT_DEATH(minidump_file_writer.WriteEverything(&file_writer), "name_");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad