Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..."

trunk/src/chrome/browser/chromeos/input_method/input_method_util.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 "chrome/browser/chromeos/input_method/input_method_util.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <utility>
@@ skipping 363 matching lines @@
   // TODO(yusukes): Some languages have two or more input methods. For example,
   // Thai has 3, Vietnamese has 4. If these input methods could be activated at
   // the same time, we should do either of the following:
   //   (1) Add mappings to |kMappingFromIdToIndicatorText|
   //   (2) Add suffix (1, 2, ...) to |text| when ambiguous.
 
   if (text.empty()) {
     const size_t kMaxLanguageNameLen = 2;
     DCHECK(!input_method.language_codes().empty());
     const std::string language_code = input_method.language_codes().at(0);
-    text = base::StringToUpperASCII(base::UTF8ToUTF16(language_code)).substr(
+    text = StringToUpperASCII(base::UTF8ToUTF16(language_code)).substr(
         0, kMaxLanguageNameLen);
   }
   DCHECK(!text.empty()) << input_method.id();
   return text;
 }
 
 base::string16 InputMethodUtil::GetInputMethodMediumName(
     const InputMethodDescriptor& input_method) const {
   // For the "Your input method has changed to..." bubble. In most cases
   // it uses the same name as the short name, unless found in a table
@@ skipping 326 matching lines @@
       "US",
       layouts,
       languages,
       true,  // login keyboard.
       GURL(),  // options page, not available.
       GURL()); // input view page, not available.
 }
 
 }  // namespace input_method
 }  // namespace chromeos