Move string16 and char16 in to base::

minidump/minidump_misc_info_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 42 matching lines @@
   ASSERT_TRUE(directory);
 
   ASSERT_EQ(kMinidumpStreamTypeMiscInfo, directory[0].StreamType);
   EXPECT_EQ(kMiscInfoStreamOffset, directory[0].Location.Rva);
 
   *misc_info = MinidumpWritableAtLocationDescriptor<T>(file_contents,
                                                        directory[0].Location);
   ASSERT_TRUE(misc_info);
 }
 
-void ExpectNULPaddedString16Equal(const char16* expected,
-                                  const char16* observed,
+void ExpectNULPaddedString16Equal(const base::char16* expected,
+                                  const base::char16* observed,
                                   size_t size) {
-  string16 expected_string(expected, size);
-  string16 observed_string(observed, size);
+  base::string16 expected_string(expected, size);
+  base::string16 observed_string(observed, size);
   EXPECT_EQ(expected_string, observed_string);
 }
 
 void ExpectSystemTimeEqual(const SYSTEMTIME* expected,
                            const SYSTEMTIME* observed) {
   EXPECT_EQ(expected->wYear, observed->wYear);
   EXPECT_EQ(expected->wMonth, observed->wMonth);
   EXPECT_EQ(expected->wDayOfWeek, observed->wDayOfWeek);
   EXPECT_EQ(expected->wDay, observed->wDay);
   EXPECT_EQ(expected->wHour, observed->wHour);
@@ skipping 277 matching lines @@
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MISC_INFO_3* observed;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(file_writer.string(), &observed));
 
   MINIDUMP_MISC_INFO_3 expected = {};
   expected.Flags1 = MINIDUMP_MISC3_TIMEZONE;
   expected.TimeZoneId = kTimeZoneId;
   expected.TimeZone.Bias = kBias;
-  string16 standard_name_utf16 = base::UTF8ToUTF16(kStandardName);
+  base::string16 standard_name_utf16 = base::UTF8ToUTF16(kStandardName);
   c16lcpy(expected.TimeZone.StandardName,
           standard_name_utf16.c_str(),
           arraysize(expected.TimeZone.StandardName));
   memcpy(&expected.TimeZone.StandardDate,
          &kStandardDate,
          sizeof(expected.TimeZone.StandardDate));
   expected.TimeZone.StandardBias = kStandardBias;
-  string16 daylight_name_utf16 = base::UTF8ToUTF16(kDaylightName);
+  base::string16 daylight_name_utf16 = base::UTF8ToUTF16(kDaylightName);
   c16lcpy(expected.TimeZone.DaylightName,
           daylight_name_utf16.c_str(),
           arraysize(expected.TimeZone.DaylightName));
   memcpy(&expected.TimeZone.DaylightDate,
          &kDaylightDate,
          sizeof(expected.TimeZone.DaylightDate));
   expected.TimeZone.DaylightBias = kDaylightBias;
 
   ExpectMiscInfoEqual(&expected, observed);
 }
@@ skipping 33 matching lines @@
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MISC_INFO_3* observed;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(file_writer.string(), &observed));
 
   MINIDUMP_MISC_INFO_3 expected = {};
   expected.Flags1 = MINIDUMP_MISC3_TIMEZONE;
   expected.TimeZoneId = kTimeZoneId;
   expected.TimeZone.Bias = kBias;
-  string16 standard_name_utf16 = base::UTF8ToUTF16(standard_name);
+  base::string16 standard_name_utf16 = base::UTF8ToUTF16(standard_name);
   c16lcpy(expected.TimeZone.StandardName,
           standard_name_utf16.c_str(),
           arraysize(expected.TimeZone.StandardName));
   memcpy(&expected.TimeZone.StandardDate,
          &kSystemTimeZero,
          sizeof(expected.TimeZone.StandardDate));
   expected.TimeZone.StandardBias = kStandardBias;
-  string16 daylight_name_utf16 = base::UTF8ToUTF16(daylight_name);
+  base::string16 daylight_name_utf16 = base::UTF8ToUTF16(daylight_name);
   c16lcpy(expected.TimeZone.DaylightName,
           daylight_name_utf16.c_str(),
           arraysize(expected.TimeZone.DaylightName));
   memcpy(&expected.TimeZone.DaylightDate,
          &kSystemTimeZero,
          sizeof(expected.TimeZone.DaylightDate));
   expected.TimeZone.DaylightBias = kDaylightBias;
 
   ExpectMiscInfoEqual(&expected, observed);
 }
@@ skipping 10 matching lines @@
   minidump_file_writer.AddStream(misc_info_writer.Pass());
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MISC_INFO_4* observed;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(file_writer.string(), &observed));
 
   MINIDUMP_MISC_INFO_4 expected = {};
   expected.Flags1 = MINIDUMP_MISC4_BUILDSTRING;
-  string16 build_string_utf16 = base::UTF8ToUTF16(kBuildString);
+  base::string16 build_string_utf16 = base::UTF8ToUTF16(kBuildString);
   c16lcpy(expected.BuildString,
           build_string_utf16.c_str(),
           arraysize(expected.BuildString));
-  string16 debug_build_string_utf16 = base::UTF8ToUTF16(kDebugBuildString);
+  base::string16 debug_build_string_utf16 =
+      base::UTF8ToUTF16(kDebugBuildString);
   c16lcpy(expected.DbgBldStr,
           debug_build_string_utf16.c_str(),
           arraysize(expected.DbgBldStr));
 
   ExpectMiscInfoEqual(&expected, observed);
 }
 
 TEST(MinidumpMiscInfoWriter, BuildStringsOverflow) {
   // This test makes sure that the build strings are truncated properly to the
   // widths of their fields.
@@ skipping 11 matching lines @@
   minidump_file_writer.AddStream(misc_info_writer.Pass());
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MISC_INFO_4* observed;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(file_writer.string(), &observed));
 
   MINIDUMP_MISC_INFO_4 expected = {};
   expected.Flags1 = MINIDUMP_MISC4_BUILDSTRING;
-  string16 build_string_utf16 = base::UTF8ToUTF16(build_string);
+  base::string16 build_string_utf16 = base::UTF8ToUTF16(build_string);
   c16lcpy(expected.BuildString,
           build_string_utf16.c_str(),
           arraysize(expected.BuildString));
-  string16 debug_build_string_utf16 = base::UTF8ToUTF16(debug_build_string);
+  base::string16 debug_build_string_utf16 =
+      base::UTF8ToUTF16(debug_build_string);
   c16lcpy(expected.DbgBldStr,
           debug_build_string_utf16.c_str(),
           arraysize(expected.DbgBldStr));
 
   ExpectMiscInfoEqual(&expected, observed);
 }
 
 TEST(MinidumpMiscInfoWriter, Everything) {
   MinidumpFileWriter minidump_file_writer;
   auto misc_info_writer = make_scoped_ptr(new MinidumpMiscInfoWriter());
@@ skipping 62 matching lines @@
   expected.ProcessorMaxMhz = kProcessorMaxMhz;
   expected.ProcessorCurrentMhz = kProcessorCurrentMhz;
   expected.ProcessorMhzLimit = kProcessorMhzLimit;
   expected.ProcessorMaxIdleState = kProcessorMaxIdleState;
   expected.ProcessorCurrentIdleState = kProcessorCurrentIdleState;
   expected.ProcessIntegrityLevel = kProcessIntegrityLevel;
   expected.ProcessExecuteFlags = kProcessExecuteFlags;
   expected.ProtectedProcess = kProtectedProcess;
   expected.TimeZoneId = kTimeZoneId;
   expected.TimeZone.Bias = kBias;
-  string16 standard_name_utf16 = base::UTF8ToUTF16(kStandardName);
+  base::string16 standard_name_utf16 = base::UTF8ToUTF16(kStandardName);
   c16lcpy(expected.TimeZone.StandardName,
           standard_name_utf16.c_str(),
           arraysize(expected.TimeZone.StandardName));
   memcpy(&expected.TimeZone.StandardDate,
          &kSystemTimeZero,
          sizeof(expected.TimeZone.StandardDate));
   expected.TimeZone.StandardBias = kStandardBias;
-  string16 daylight_name_utf16 = base::UTF8ToUTF16(kDaylightName);
+  base::string16 daylight_name_utf16 = base::UTF8ToUTF16(kDaylightName);
   c16lcpy(expected.TimeZone.DaylightName,
           daylight_name_utf16.c_str(),
           arraysize(expected.TimeZone.DaylightName));
   memcpy(&expected.TimeZone.DaylightDate,
          &kSystemTimeZero,
          sizeof(expected.TimeZone.DaylightDate));
   expected.TimeZone.DaylightBias = kDaylightBias;
-  string16 build_string_utf16 = base::UTF8ToUTF16(kBuildString);
+  base::string16 build_string_utf16 = base::UTF8ToUTF16(kBuildString);
   c16lcpy(expected.BuildString,
           build_string_utf16.c_str(),
           arraysize(expected.BuildString));
-  string16 debug_build_string_utf16 = base::UTF8ToUTF16(kDebugBuildString);
+  base::string16 debug_build_string_utf16 =
+      base::UTF8ToUTF16(kDebugBuildString);
   c16lcpy(expected.DbgBldStr,
           debug_build_string_utf16.c_str(),
           arraysize(expected.DbgBldStr));
 
   ExpectMiscInfoEqual(&expected, observed);
 }
 
 TEST(MinidumpMiscInfoWriter, InitializeFromSnapshot) {
   MINIDUMP_MISC_INFO_4 expect_misc_info = {};
 
   const char kStandardTimeName[] = "EST";
   const char kDaylightTimeName[] = "EDT";
   const char kOSVersionFull[] =
       "Mac OS X 10.9.5 (13F34); "
       "Darwin 13.4.0 Darwin Kernel Version 13.4.0: "
       "Sun Aug 17 19:50:11 PDT 2014; "
       "root:xnu-2422.115.4~1/RELEASE_X86_64 x86_64";
   const char kMachineDescription[] = "MacBookPro11,3 (Mac-2BD1B31983FE1663)";
-  string16 standard_time_name_utf16 = base::UTF8ToUTF16(kStandardTimeName);
-  string16 daylight_time_name_utf16 = base::UTF8ToUTF16(kDaylightTimeName);
-  string16 build_string_utf16 = base::UTF8ToUTF16(
+  base::string16 standard_time_name_utf16 =
+      base::UTF8ToUTF16(kStandardTimeName);
+  base::string16 daylight_time_name_utf16 =
+      base::UTF8ToUTF16(kDaylightTimeName);
+  base::string16 build_string_utf16 = base::UTF8ToUTF16(
       std::string(kOSVersionFull) + "; " + kMachineDescription);
   std::string debug_build_string = internal::MinidumpMiscInfoDebugBuildString();
   EXPECT_FALSE(debug_build_string.empty());
-  string16 debug_build_string_utf16 = base::UTF8ToUTF16(debug_build_string);
+  base::string16 debug_build_string_utf16 =
+      base::UTF8ToUTF16(debug_build_string);
 
   expect_misc_info.SizeOfInfo = sizeof(expect_misc_info);
   expect_misc_info.Flags1 = MINIDUMP_MISC1_PROCESS_ID |
                             MINIDUMP_MISC1_PROCESS_TIMES |
                             MINIDUMP_MISC1_PROCESSOR_POWER_INFO |
                             MINIDUMP_MISC3_TIMEZONE |
                             MINIDUMP_MISC4_BUILDSTRING;
   expect_misc_info.ProcessId = 12345;
   expect_misc_info.ProcessCreateTime = 0x555c7740;
   expect_misc_info.ProcessUserTime = 60;
@@ skipping 56 matching lines @@
 
   const MINIDUMP_MISC_INFO_4* misc_info;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(file_writer.string(), &misc_info));
 
   ExpectMiscInfoEqual(&expect_misc_info, misc_info);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad