[Autofill] Move country combo box model from chrome to component.

components/autofill/core/browser/country_combobox_model.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/ui/autofill/country_combobox_model.h"
+#include "components/autofill/core/browser/country_combobox_model.h"
 
 #include <algorithm>
 #include <iterator>
+#include <utility>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "build/build_config.h"
-#include "chrome/browser/browser_process.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/country_data.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui.h"
 #include "ui/base/l10n/l10n_util_collator.h"
 #include "ui/base/models/combobox_model_observer.h"
 
 namespace autofill {
 
 CountryComboboxModel::CountryComboboxModel() {}
 
 CountryComboboxModel::~CountryComboboxModel() {}
 
 void CountryComboboxModel::SetCountries(
     const PersonalDataManager& manager,
-    const base::Callback<bool(const std::string&)>& filter) {
+    const base::Callback<bool(const std::string&)>& filter,
+    const std::string& app_locale) {
   countries_.clear();
 
   // Insert the default country at the top as well as in the ordered list.
   std::string default_country_code =
       manager.GetDefaultCountryCodeForNewAddress();
   DCHECK(!default_country_code.empty());
 
-  const std::string& app_locale = g_browser_process->GetApplicationLocale();
   if (filter.is_null() || filter.Run(default_country_code)) {
     countries_.push_back(
         base::MakeUnique<AutofillCountry>(default_country_code, app_locale));
 #if !defined(OS_ANDROID)
     // The separator item. On Android, there are separators after all items, so
     // this is unnecessary.
     countries_.push_back(nullptr);
 #endif
   }
 
@@ skipping 13 matching lines @@
       std::back_inserter(filtered_countries));
   available_countries = &filtered_countries;
 
   CountryVector sorted_countries;
   for (const auto& country_code : *available_countries) {
     if (filter.is_null() || filter.Run(country_code))
       sorted_countries.push_back(
           base::MakeUnique<AutofillCountry>(country_code, app_locale));
   }
 
-  l10n_util::SortStringsUsingMethod(app_locale,
-                                    &sorted_countries,
+  l10n_util::SortStringsUsingMethod(app_locale, &sorted_countries,
                                     &AutofillCountry::name);
   std::move(sorted_countries.begin(), sorted_countries.end(),
             std::back_inserter(countries_));
 }
 
 int CountryComboboxModel::GetItemCount() const {
   return countries_.size();
 }
 
 base::string16 CountryComboboxModel::GetItemAt(int index) {
   AutofillCountry* country = countries_[index].get();
   if (country)
     return countries_[index]->name();
 
   // The separator item. Implemented for platforms that don't yet support
   // IsItemSeparatorAt().
   return base::ASCIIToUTF16("---");
 }
 
 bool CountryComboboxModel::IsItemSeparatorAt(int index) {
   return !countries_[index].get();
 }
 
 std::string CountryComboboxModel::GetDefaultCountryCode() const {
   return countries_[GetDefaultIndex()]->country_code();
 }
 
 }  // namespace autofill