Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..."

trunk/src/components/autofill/core/browser/address.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/address.h"
 
 #include <stddef.h>
 #include <algorithm>
 
 #include "base/basictypes.h"
@@ skipping 141 matching lines @@
 
 bool Address::SetInfo(const AutofillType& type,
                       const base::string16& value,
                       const std::string& app_locale) {
   if (type.html_type() == HTML_TYPE_COUNTRY_CODE) {
     if (!value.empty() && (value.size() != 2u || !base::IsStringASCII(value))) {
       country_code_ = std::string();
       return false;
     }
 
-    country_code_ = base::StringToUpperASCII(base::UTF16ToASCII(value));
+    country_code_ = StringToUpperASCII(base::UTF16ToASCII(value));
     return true;
   } else if (type.html_type() == HTML_TYPE_FULL_ADDRESS) {
     // Parsing a full address is too hard.
     return false;
   }
 
   ServerFieldType storable_type = type.GetStorableType();
   if (storable_type == ADDRESS_HOME_COUNTRY && !value.empty()) {
     country_code_ = AutofillCountry::GetCountryCode(value, app_locale);
     return !country_code_.empty();
@@ skipping 38 matching lines @@
   supported_types->insert(ADDRESS_HOME_COUNTRY);
 }
 
 void Address::TrimStreetAddress() {
   while (!street_address_.empty() && street_address_.back().empty()) {
     street_address_.pop_back();
   }
 }
 
 }  // namespace autofill