Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(539)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: minidump/minidump_misc_info_writer_test.cc

Issue 804593002: Move string16 and char16 in to base:: (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: include roll of mini_chromium to 37bac7... Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « compat/non_win/timezoneapi.h ('k') | minidump/minidump_module_writer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: minidump/minidump_misc_info_writer_test.cc
diff --git a/minidump/minidump_misc_info_writer_test.cc b/minidump/minidump_misc_info_writer_test.cc
index 929c92881398b4ddbbc4e9ed8bcc262b56a3df10..3ff632e929ff366c23821b6b54ff6b68d8aecf60 100644
--- a/minidump/minidump_misc_info_writer_test.cc
+++ b/minidump/minidump_misc_info_writer_test.cc
@@ -60,11 +60,11 @@ void GetMiscInfoStream(const std::string& file_contents, const T** misc_info) {
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);
}
@@ -362,7 +362,7 @@ TEST(MinidumpMiscInfoWriter, TimeZone) {
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));
@@ -370,7 +370,7 @@ TEST(MinidumpMiscInfoWriter, TimeZone) {
&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));
@@ -424,7 +424,7 @@ TEST(MinidumpMiscInfoWriter, TimeZoneStringsOverflow) {
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));
@@ -432,7 +432,7 @@ TEST(MinidumpMiscInfoWriter, TimeZoneStringsOverflow) {
&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));
@@ -463,11 +463,12 @@ TEST(MinidumpMiscInfoWriter, BuildStrings) {
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));
@@ -499,11 +500,12 @@ TEST(MinidumpMiscInfoWriter, BuildStringsOverflow) {
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));
@@ -586,7 +588,7 @@ TEST(MinidumpMiscInfoWriter, Everything) {
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));
@@ -594,7 +596,7 @@ TEST(MinidumpMiscInfoWriter, Everything) {
&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));
@@ -602,11 +604,12 @@ TEST(MinidumpMiscInfoWriter, Everything) {
&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));
@@ -625,13 +628,16 @@ TEST(MinidumpMiscInfoWriter, InitializeFromSnapshot) {
"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 |
« no previous file with comments | « compat/non_win/timezoneapi.h ('k') | minidump/minidump_module_writer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698