Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..."

trunk/src/components/autofill/core/browser/autofill_country.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/autofill/core/browser/autofill_country.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <map>
 #include <utility>
@@ skipping 916 matching lines @@
 }
 
 CountryNames::~CountryNames() {
   STLDeleteContainerPairSecondPointers(collators_.begin(),
                                        collators_.end());
 }
 
 const std::string CountryNames::GetCountryCode(const base::string16& country,
                                                const std::string& locale) {
   // First, check common country names, including 2- and 3-letter country codes.
-  std::string country_utf8 =
-      base::UTF16ToUTF8(base::StringToUpperASCII(country));
+  std::string country_utf8 = base::UTF16ToUTF8(StringToUpperASCII(country));
   std::map<std::string, std::string>::const_iterator result =
       common_names_.find(country_utf8);
   if (result != common_names_.end())
     return result->second;
 
   // Next, check country names localized to |locale|.
   std::string country_code = GetCountryCodeForLocalizedName(country, locale);
   if (!country_code.empty())
     return country_code;
 
@@ skipping 160 matching lines @@
                                  const base::string16& name,
                                  const base::string16& postal_code_label,
                                  const base::string16& state_label)
     : country_code_(country_code),
       name_(name),
       postal_code_label_(postal_code_label),
       state_label_(state_label) {
 }
 
 }  // namespace autofill