Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..."

trunk/src/ui/base/l10n/l10n_util_win.cc

 // Copyright (c) 2011 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 "ui/base/l10n/l10n_util_win.h"
 
 #include <windowsx.h>
 #include <algorithm>
 #include <iterator>
 
@@ skipping 94 matching lines @@
     ::InvalidateRect(hwnd, NULL, true);
   }
 }
 
 bool IsLocaleSupportedByOS(const std::string& locale) {
   // Block Amharic on Windows XP unless 'Abyssinica SIL' font is present.
   // On Win XP, no Ethiopic/Amahric font is availabel out of box. We hard-coded
   // 'Abyssinica SIL' in the resource bundle to use in the UI. Check
   // for its presence to determine whether or not to support Amharic UI on XP.
   return (base::win::GetVersion() >= base::win::VERSION_VISTA ||
-      !base::LowerCaseEqualsASCII(locale, "am") ||
-      IsFontPresent(L"Abyssinica SIL"));
+      !LowerCaseEqualsASCII(locale, "am") || IsFontPresent(L"Abyssinica SIL"));
 }
 
 bool NeedOverrideDefaultUIFont(base::string16* override_font_family,
                                double* font_size_scaler) {
   // This is rather simple-minded to deal with the UI font size
   // issue for some Indian locales (ml, bn, hi) for which
   // the default Windows fonts are too small to be legible.  For those
   // locales, IDS_UI_FONT_FAMILY is set to an actual font family to
   // use while for other locales, it's set to 'default'.
 
@@ skipping 71 matching lines @@
   } else {
     NOTREACHED() << "Failed to determine the UI language for locale override.";
   }
 }
 
 const std::vector<std::string>& GetLocaleOverrides() {
   return override_locale_holder.Get().value();
 }
 
 }  // namespace l10n_util