Move l10n_util's GetCanonicalLocal() function into base/i18n module.

ui/base/l10n/l10n_util.h

 // 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.
 
 // This file contains utility functions for dealing with localized
 // content.
 
 #ifndef UI_BASE_L10N_L10N_UTIL_H_
 #define UI_BASE_L10N_L10N_UTIL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "ui/base/ui_base_export.h"
 
 #if defined(OS_MACOSX)
 #include "ui/base/l10n/l10n_util_mac.h"
 #endif  // OS_MACOSX
 
 namespace l10n_util {
 
-// The same as base::i18n::GetCanonicalLocale(const char*), but takes
-// std::string as an argument.
-UI_BASE_EXPORT std::string GetCanonicalLocale(const std::string& locale);
-
 // Takes normalized locale as |locale|. Returns language part (before '-').
 UI_BASE_EXPORT std::string GetLanguage(const std::string& locale);
 
 // This method translates a generic locale name to one of the locally defined
 // ones. This method returns true if it succeeds.
 UI_BASE_EXPORT bool CheckAndResolveLocale(const std::string& locale,
                                           std::string* resolved_locale);
 
 // This method is responsible for determining the locale as defined below. In
 // nearly all cases you shouldn't call this, rather use GetApplicationLocale
@@ skipping 157 matching lines @@
 // designer given constraints which might dependent on the language used.
 UI_BASE_EXPORT int GetLocalizedContentsWidthInPixels(int pixel_resource_id);
 
 UI_BASE_EXPORT const char* const* GetAcceptLanguageListForTesting();
 
 UI_BASE_EXPORT size_t GetAcceptLanguageListSizeForTesting();
 
 }  // namespace l10n_util
 
 #endif  // UI_BASE_L10N_L10N_UTIL_H_