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

Unified Diff: minidump/minidump_writer_util.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 | « minidump/minidump_writer_util.h ('k') | minidump/test/minidump_string_writer_test_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: minidump/minidump_writer_util.cc
diff --git a/minidump/minidump_writer_util.cc b/minidump/minidump_writer_util.cc
index 6afcb1f2b8afc697bf9dc30718282fd855739987..fcaa40420e3a4ac0d406d27fef243f7303d5468f 100644
--- a/minidump/minidump_writer_util.cc
+++ b/minidump/minidump_writer_util.cc
@@ -32,8 +32,8 @@ void MinidumpWriterUtil::AssignTimeT(uint32_t* destination, time_t source) {
}
// static
-string16 MinidumpWriterUtil::ConvertUTF8ToUTF16(const std::string& utf8) {
- string16 utf16;
+base::string16 MinidumpWriterUtil::ConvertUTF8ToUTF16(const std::string& utf8) {
+ base::string16 utf16;
if (!base::UTF8ToUTF16(utf8.data(), utf8.length(), &utf16)) {
LOG(WARNING) << "string " << utf8
<< " cannot be converted to UTF-16 losslessly";
@@ -42,10 +42,10 @@ string16 MinidumpWriterUtil::ConvertUTF8ToUTF16(const std::string& utf8) {
}
// static
-void MinidumpWriterUtil::AssignUTF8ToUTF16(char16* destination,
+void MinidumpWriterUtil::AssignUTF8ToUTF16(base::char16* destination,
size_t destination_size,
const std::string& source) {
- string16 source_utf16 = ConvertUTF8ToUTF16(source);
+ base::string16 source_utf16 = ConvertUTF8ToUTF16(source);
if (source_utf16.size() > destination_size - 1) {
LOG(WARNING) << "string " << source << " UTF-16 length "
<< source_utf16.size()
« no previous file with comments | « minidump/minidump_writer_util.h ('k') | minidump/test/minidump_string_writer_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698