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

Unified Diff: chrome/browser/rlz/rlz.cc

Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
Index: chrome/browser/rlz/rlz.cc
diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc
index 666a4f958ba0bec4f0cd68ae53e8fb08a7e4e385..f54d1918f2a6a5e87b34cccd1f97f0aeaa431418 100644
--- a/chrome/browser/rlz/rlz.cc
+++ b/chrome/browser/rlz/rlz.cc
@@ -359,7 +359,7 @@ void RLZTracker::PingNowImpl() {
base::string16 lang;
GoogleUpdateSettings::GetLanguage(&lang);
if (lang.empty())
- lang = ASCIIToUTF16("en");
+ lang = base::ASCIIToUTF16("en");
base::string16 referral;
GoogleUpdateSettings::GetReferral(&referral);
@@ -494,7 +494,7 @@ std::string RLZTracker::GetAccessPointHttpHeader(rlz_lib::AccessPoint point) {
RLZTracker::GetAccessPointRlz(point, &rlz_string);
if (!rlz_string.empty()) {
net::HttpUtil::AppendHeaderIfMissing("X-Rlz-String",
- UTF16ToUTF8(rlz_string),
+ base::UTF16ToUTF8(rlz_string),
&extra_headers);
}
@@ -533,7 +533,7 @@ bool RLZTracker::GetAccessPointRlzImpl(rlz_lib::AccessPoint point,
if (!rlz_lib::GetAccessPointRlz(point, str_rlz, rlz_lib::kMaxRlzLength))
return false;
- base::string16 rlz_local(ASCIIToUTF16(std::string(str_rlz)));
+ base::string16 rlz_local(base::ASCIIToUTF16(std::string(str_rlz)));
if (rlz)
*rlz = rlz_local;
« no previous file with comments | « chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc ('k') | chrome/browser/rlz/rlz_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698