content/browser/geolocation/wifi_data_provider_chromeos.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_chromeos.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/network_location_request.cc ('k') | content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/geolocation/wifi_data_provider_chromeos.cc

diff --git a/content/browser/geolocation/wifi_data_provider_chromeos.cc b/content/browser/geolocation/wifi_data_provider_chromeos.cc

index a8b20414ceb8cfadca241f5fe206c2691ba75f4c..49edb23e85c29f20758d36441f14731d9955a081 100644

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

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

@@ -151,11 +151,11 @@ bool WifiDataProviderChromeOs::GetAccessPointData(

= access_points.begin();

i != access_points.end(); ++i) {

AccessPointData ap_data;

- ap_data.mac_address = ASCIIToUTF16(i->mac_address);

+ ap_data.mac_address = base::ASCIIToUTF16(i->mac_address);

ap_data.radio_signal_strength = i->signal_strength;

ap_data.channel = i->channel;

ap_data.signal_to_noise = i->signal_to_noise;

- ap_data.ssid = UTF8ToUTF16(i->ssid);

+ ap_data.ssid = base::UTF8ToUTF16(i->ssid);

result->insert(ap_data);

}

// If the age is significantly longer than our long polling time, assume the