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

components/autofill/core/browser/country_combobox_model.h

Index: components/autofill/core/browser/country_combobox_model.h
diff --git a/chrome/browser/ui/autofill/country_combobox_model.h b/components/autofill/core/browser/country_combobox_model.h
similarity index 85%
rename from chrome/browser/ui/autofill/country_combobox_model.h
rename to components/autofill/core/browser/country_combobox_model.h
index d7e25a6a0c2b021d83ba3b0a7c9f5a076b70a57c..c1cfbaa5ee8031b51a603954b52766e1a8f62df7 100644
--- a/chrome/browser/ui/autofill/country_combobox_model.h
+++ b/components/autofill/core/browser/country_combobox_model.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_AUTOFILL_COUNTRY_COMBOBOX_MODEL_H_
-#define CHROME_BROWSER_UI_AUTOFILL_COUNTRY_COMBOBOX_MODEL_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_COUNTRY_COMBOBOX_MODEL_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_COUNTRY_COMBOBOX_MODEL_H_
 
 #include <memory>
 #include <set>

[Mathieu, 2017/02/21 00:57:20]

unused?

[MAD, 2017/02/21 15:56:18]

Done.

@@ -33,7 +33,8 @@ class CountryComboboxModel : public ui::ComboboxModel {
   // true, an item for that country is added to the model (else it's omitted).
   // |manager| determines the default choice.
   void 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);
 
   // ui::ComboboxModel implementation:
   int GetItemCount() const override;
@@ -55,4 +56,4 @@ class CountryComboboxModel : public ui::ComboboxModel {
 
 }  // namespace autofill
 
-#endif  // CHROME_BROWSER_UI_AUTOFILL_COUNTRY_COMBOBOX_MODEL_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_COUNTRY_COMBOBOX_MODEL_H_