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

Unified Diff: chrome_frame/metrics_service.cc

Issue 112433004: Update uses of UTF conversions in chrome_frame/, chromeos/, components/ 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
« no previous file with comments | « chrome_frame/http_negotiate.cc ('k') | chrome_frame/navigation_constraints.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/metrics_service.cc
diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc
index 74d362610ed7f6b949c45bbade8060fab9a35abc..da7cffd813ad11e53b4064106655b14999bf541e 100644
--- a/chrome_frame/metrics_service.cc
+++ b/chrome_frame/metrics_service.cc
@@ -139,7 +139,7 @@ class ChromeFrameMetricsDataUploader : public BSCBImpl {
RewindStream(cache_stream_);
- server_url_ = ASCIIToWide(server_url);
+ server_url_ = base::ASCIIToWide(server_url);
mime_type_ = mime_type;
DCHECK(!server_url_.empty());
DCHECK(!mime_type_.empty());
@@ -185,7 +185,7 @@ class ChromeFrameMetricsDataUploader : public BSCBImpl {
*additional_headers = reinterpret_cast<wchar_t*>(
CoTaskMemAlloc((new_headers.size() + 1) * sizeof(wchar_t)));
- lstrcpynW(*additional_headers, ASCIIToWide(new_headers).c_str(),
+ lstrcpynW(*additional_headers, base::ASCIIToWide(new_headers).c_str(),
new_headers.size());
return BSCBImpl::BeginningTransaction(url, headers, reserved,
@@ -315,7 +315,8 @@ const std::string& MetricsService::GetClientID() {
int result = StringFromGUID2(guid,
WriteInto(&guid_string, kGUIDSize), kGUIDSize);
DCHECK(result == kGUIDSize);
- client_id_ = WideToUTF8(guid_string.substr(1, guid_string.length() - 2));
+ client_id_ =
+ base::WideToUTF8(guid_string.substr(1, guid_string.length() - 2));
}
return client_id_;
}
« no previous file with comments | « chrome_frame/http_negotiate.cc ('k') | chrome_frame/navigation_constraints.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698