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

chrome/browser/chromeos/customization/customization_document.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/customization/customization_document.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/i18n/rtl.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 12 matching lines @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/system/statistics_provider.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/common/extension_urls.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
-#include "ui/base/l10n/l10n_util.h"
 
 #if !defined(USE_ATHENA)
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #endif
 
 using content::BrowserThread;
 
 namespace chromeos {
 namespace {
 
@@ skipping 271 matching lines @@
   statistics_provider->GetMachineStatistic(kInitialLocaleAttr,
                                            &initial_locale_);
   statistics_provider->GetMachineStatistic(kInitialTimezoneAttr,
                                            &initial_timezone_);
   statistics_provider->GetMachineStatistic(kKeyboardLayoutAttr,
                                            &keyboard_layout_);
   configured_locales_.resize(0);
   base::SplitString(initial_locale_, ',', &configured_locales_);
 
   // Convert ICU locale to chrome ("en_US" to "en-US", etc.).
-  std::for_each(configured_locales_.begin(),
-                configured_locales_.end(),
-                l10n_util::GetCanonicalLocale);
+  std::for_each(configured_locales_.begin(), configured_locales_.end(),
+                base::i18n::GetCanonicalLocale);
 
   // Let's always have configured_locales_.front() a valid entry.
   if (configured_locales_.size() == 0)
     configured_locales_.push_back(std::string());
 }
 
 const std::vector<std::string>&
 StartupCustomizationDocument::configured_locales() const {
   return configured_locales_;
 }
@@ skipping 613 matching lines @@
   apply_tasks_success_ += success;
 
   if (apply_tasks_started_ != apply_tasks_finished_)
     return;
 
   if (apply_tasks_success_ == apply_tasks_finished_)
     SetApplied(true);
 }
 
 }  // namespace chromeos