summaryrefslogtreecommitdiffstats
path: root/chrome/browser/search_engines
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 12:31:26 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 12:31:26 +0000
commit9b742fbb3a44c7185d94e827b7573d552b9794ec (patch)
treef79f6894c93a89a0671e6a2ea876a9b4edc5ef9b /chrome/browser/search_engines
parent489199b97c93c1d9d3e82a7bf78b818cd87c4fc2 (diff)
downloadchromium_src-9b742fbb3a44c7185d94e827b7573d552b9794ec.zip
chromium_src-9b742fbb3a44c7185d94e827b7573d552b9794ec.tar.gz
chromium_src-9b742fbb3a44c7185d94e827b7573d552b9794ec.tar.bz2
Move ToUpperASCII into base namespace, to make it consistent with ToLowerASCII
This mirrors the change made in http://src.chromium.org/viewvc/chrome?view=rev&revision=64879 BUG=None TEST=everything builds; base unit tests pass Review URL: http://codereview.chromium.org/5007001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines')
-rw-r--r--chrome/browser/search_engines/template_url_prepopulate_data.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc
index 127944a..b1fa624 100644
--- a/chrome/browser/search_engines/template_url_prepopulate_data.cc
+++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc
@@ -2938,7 +2938,8 @@ int GetCurrentCountryID() {
// The territory part must contain exactly two characters.
if (end - begin == 2) {
return CountryCharsToCountryIDWithUpdate(
- ToUpperASCII(locale_str[begin]), ToUpperASCII(locale_str[begin + 1]));
+ base::ToUpperASCII(locale_str[begin]),
+ base::ToUpperASCII(locale_str[begin + 1]));
}
return kCountryIDUnknown;