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

chrome/browser/extensions/api/autofill_private/autofill_util.cc

 // Copyright 2015 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/extensions/api/autofill_private/autofill_util.h"
 
 #include <stddef.h>
 
 #include <utility>
+#include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/settings_private/prefs_util.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/autofill/country_combobox_model.h"
 #include "chrome/common/extensions/api/autofill_private.h"
 #include "chrome/common/pref_names.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/country_combobox_model.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/prefs/pref_service.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill_private = extensions::api::autofill_private;
 
 namespace {
 
@@ skipping 150 matching lines @@
   AddressEntryList list;
   for (size_t i = 0; i < profiles.size(); ++i)
     list.push_back(ProfileToAddressEntry(*profiles[i], labels[i]));
 
   return list;
 }
 
 CountryEntryList GenerateCountryList(
     const autofill::PersonalDataManager& personal_data) {
   autofill::CountryComboboxModel model;
-  model.SetCountries(personal_data, base::Callback<bool(const std::string&)>());
+  model.SetCountries(personal_data, base::Callback<bool(const std::string&)>(),
+                     g_browser_process->GetApplicationLocale());
   const std::vector<std::unique_ptr<autofill::AutofillCountry>>& countries =
       model.countries();
 
   CountryEntryList list;
 
   for (const auto& country : countries)
     list.push_back(CountryToCountryEntry(country.get()));
 
   return list;
 }
 
 CreditCardEntryList GenerateCreditCardList(
     const autofill::PersonalDataManager& personal_data) {
   const std::vector<autofill::CreditCard*>& cards =
       personal_data.GetCreditCards();
 
   CreditCardEntryList list;
   for (const autofill::CreditCard* card : cards)
     list.push_back(CreditCardToCreditCardEntry(*card));
 
   return list;
 }
 
 }  // namespace autofill_util
 
 }  // namespace extensions