Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..."

trunk/src/content/common/android/address_parser.cc

 // Copyright (c) 2012 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 "content/common/android/address_parser.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "content/common/android/address_parser_internal.h"
 
@@ skipping 153 matching lines @@
                                     &tokenizer, &state_index)) {
 
           // A location name should have been found at this point.
           if (!found_location_name)
             break;
 
           // Explicitly exclude "et al", as "al" is a valid state code.
           if (current_word_length == 2 && words.size() > 2) {
             const Word& previous_word = words[state_first_word - 1];
             if (previous_word.end - previous_word.begin == 2 &&
-                base::LowerCaseEqualsASCII(previous_word.begin,
-                                           previous_word.end,
-                                           "et") &&
-                base::LowerCaseEqualsASCII(current_word.begin,
-                                           current_word.end,
-                                           "al"))
+                LowerCaseEqualsASCII(previous_word.begin, previous_word.end,
+                                     "et") &&
+                LowerCaseEqualsASCII(current_word.begin, current_word.end,
+                                     "al"))
               break;
           }
 
           // Extract one more word from the tokenizer if not already available.
           size_t zip_word = state_last_word + 1;
           if (zip_word == words.size()) {
             do {
               if (!tokenizer.GetNext())
                 return false;
             } while (tokenizer.token_is_delim());
@@ skipping 23 matching lines @@
       it = words[next_word].end;
     }
   }
 
   return false;
 }
 
 }  // namespace address_parser
 
 }  // namespace content