content/browser/geolocation/wifi_data_provider_common.cc - Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 121033002: Update uses of UTF conversions in content/ 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 | « content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc ('k') | content/browser/geolocation/wifi_data_provider_common_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 9c2cbae234564dd38d0a464525f8c6d84fc0becb..388a17e5a9bf3ade6a13ac1c50a58e7790d3dbfb 100644

--- a/content/browser/geolocation/wifi_data_provider_common.cc

+++ b/content/browser/geolocation/wifi_data_provider_common.cc

@@ -15,13 +15,13 @@ base::string16 MacAddressAsString16(const uint8 mac_as_int[6]) {

// Format is XX-XX-XX-XX-XX-XX.

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]));

+ return base::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()