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

Unified Diff: content/browser/geolocation/wifi_data_provider_common.cc

Issue 10449042: Remove wchar/wstring version of StringPrintf. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 7 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
Index: content/browser/geolocation/wifi_data_provider_common.cc
diff --git a/content/browser/geolocation/wifi_data_provider_common.cc b/content/browser/geolocation/wifi_data_provider_common.cc
index 7156d1256b4ec53f720a2c1b549a3ee5484ce05b..d18b21d30cf76130997f0095e43c8be0f4b6f654 100644
--- a/content/browser/geolocation/wifi_data_provider_common.cc
+++ b/content/browser/geolocation/wifi_data_provider_common.cc
@@ -11,15 +11,15 @@
string16 MacAddressAsString16(const uint8 mac_as_int[6]) {
// mac_as_int is big-endian. Write in byte chunks.
// Format is XX-XX-XX-XX-XX-XX.
- static const wchar_t* const kMacFormatString =
- L"%02x-%02x-%02x-%02x-%02x-%02x";
- return WideToUTF16(base::StringPrintf(kMacFormatString,
- mac_as_int[0],
- mac_as_int[1],
- mac_as_int[2],
- mac_as_int[3],
- mac_as_int[4],
- mac_as_int[5]));
+ static const char* const kMacFormatString =
+ "%02x-%02x-%02x-%02x-%02x-%02x";
+ return ASCIIToUTF16(base::StringPrintf(kMacFormatString,
+ mac_as_int[0],
+ mac_as_int[1],
+ mac_as_int[2],
+ mac_as_int[3],
+ mac_as_int[4],
+ mac_as_int[5]));
}
WifiDataProviderCommon::WifiDataProviderCommon()

Powered by Google App Engine
This is Rietveld 408576698