Revert 135484 - Use Android API for GetDisplayNameForLocale().

ui/base/l10n/l10n_util.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
 // This file contains utility functions for dealing with localized
 // content.
 
 #ifndef UI_BASE_L10N_L10N_UTIL_H_
 #define UI_BASE_L10N_L10N_UTIL_H_
 #pragma once
 
@@ skipping 32 matching lines @@
 // it returns "French". To get the display name of
 // |locale| in the UI language of Chrome, |display_locale| can be
 // set to the return value of g_browser_process->GetApplicationLocale()
 // in the UI thread.
 // If |is_for_ui| is true, U+200F is appended so that it can be
 // rendered properly in a RTL Chrome.
 UI_EXPORT string16 GetDisplayNameForLocale(const std::string& locale,
                                            const std::string& display_locale,
                                            bool is_for_ui);
 
-// Returns the display name of the |country_code| in |display_locale|.
-UI_EXPORT string16 GetDisplayNameForCountry(const std::string& country_code,
-                                            const std::string& display_locale);
-
 // Converts all - into _, to be consistent with ICU and file system names.
 UI_EXPORT std::string NormalizeLocale(const std::string& locale);
 
 // Produce a vector of parent locales for given locale.
 // It includes the current locale in the result.
 // sr_Cyrl_RS generates sr_Cyrl_RS, sr_Cyrl and sr.
 UI_EXPORT void GetParentLocales(const std::string& current_locale,
                                 std::vector<std::string>* parent_locales);
 
 // Checks if a string is plausibly a syntactically-valid locale string,
@@ skipping 77 matching lines @@
 
 // Returns a vector of locale codes usable for accept-languages.
 UI_EXPORT void GetAcceptLanguagesForLocale(
     const std::string& display_locale,
     std::vector<std::string>* locale_codes);
 
 
 }  // namespace l10n_util
 
 #endif  // UI_BASE_L10N_L10N_UTIL_H_