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

Unified Diff: chrome/common/logging_chrome.cc

Issue 12314090: Add utf_string_conversions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months 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 | « chrome/common/json_value_serializer_unittest.cc ('k') | chrome/common/service_process_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/logging_chrome.cc
diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc
index 896cc7bc7f1b53b114ec9a6df8891f8503a7550f..fbfdfc9d7f6b6766b1a324fd0188485a13b68e33 100644
--- a/chrome/common/logging_chrome.cc
+++ b/chrome/common/logging_chrome.cc
@@ -383,7 +383,7 @@ base::FilePath GetLogFileName() {
scoped_ptr<base::Environment> env(base::Environment::Create());
if (env->GetVar(env_vars::kLogFileName, &filename) && !filename.empty()) {
#if defined(OS_WIN)
- return base::FilePath(UTF8ToWide(filename));
+ return base::FilePath(base::UTF8ToWide(filename));
#elif defined(OS_POSIX)
return base::FilePath(filename);
#endif
@@ -422,7 +422,7 @@ size_t GetFatalAssertions(AssertionList* assertions) {
while (!log_file.eof()) {
getline(log_file, utf8_line);
if (utf8_line.find(":FATAL:") != std::string::npos) {
- wide_line = UTF8ToWide(utf8_line);
+ wide_line = base::UTF8ToWide(utf8_line);
if (assertions)
assertions->push_back(wide_line);
++assertion_count;
« no previous file with comments | « chrome/common/json_value_serializer_unittest.cc ('k') | chrome/common/service_process_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698