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

components/autofill/core/browser/country_combobox_model_unittest.cc

Index: components/autofill/core/browser/country_combobox_model_unittest.cc
diff --git a/chrome/browser/ui/autofill/country_combobox_model_unittest.cc b/components/autofill/core/browser/country_combobox_model_unittest.cc
similarity index 60%
rename from chrome/browser/ui/autofill/country_combobox_model_unittest.cc
rename to components/autofill/core/browser/country_combobox_model_unittest.cc
index 438835389b21accc78de0aec942ab095f8f5b0a8..ca3e9f0f3beac721f5c36586a494d19c422890df 100644
--- a/chrome/browser/ui/autofill/country_combobox_model_unittest.cc
+++ b/components/autofill/core/browser/country_combobox_model_unittest.cc
@@ -2,19 +2,14 @@
 // 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 <memory>
 
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/signin/account_tracker_service_factory.h"
-#include "chrome/browser/signin/signin_manager_factory.h"
-#include "chrome/test/base/testing_profile.h"
 #include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/test_personal_data_manager.h"
-#include "components/signin/core/browser/account_tracker_service.h"
-#include "components/signin/core/browser/signin_manager.h"
-#include "content/public/test/test_browser_thread_bundle.h"
+#include "components/prefs/pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui_component.h"
@@ -24,24 +19,23 @@ namespace autofill {
 
 class CountryComboboxModelTest : public testing::Test {
  public:
-  CountryComboboxModelTest() {
-    manager_.Init(
-        NULL, profile_.GetPrefs(),
-        AccountTrackerServiceFactory::GetForProfile(&profile_),
-        SigninManagerFactory::GetForProfile(&profile_), false);
+  CountryComboboxModelTest()
+      : pref_service_(autofill::test::PrefServiceForTesting()) {
+    manager_.SetTestingPrefService(pref_service_.get());
     manager_.set_timezone_country_code("KR");
     model_.reset(new CountryComboboxModel());
-    model_->SetCountries(manager_, base::Callback<bool(const std::string&)>());
+    model_->SetCountries(manager_, base::Callback<bool(const std::string&)>(),
+                         "en-US");
   }
 
+  void TearDown() override { manager_.SetTestingPrefService(nullptr); }
+
   TestPersonalDataManager* manager() { return &manager_; }
   CountryComboboxModel* model() { return model_.get(); }
 
  private:
-  // NB: order is important here - |profile_| must go down after |manager_|.
-  content::TestBrowserThreadBundle thread_bundle_;
-  TestingProfile profile_;
   TestPersonalDataManager manager_;
+  std::unique_ptr<PrefService> pref_service_;
   std::unique_ptr<CountryComboboxModel> model_;
 };
 
@@ -49,8 +43,7 @@ TEST_F(CountryComboboxModelTest, DefaultCountryCode) {
   std::string default_country = model()->GetDefaultCountryCode();
   EXPECT_EQ(manager()->GetDefaultCountryCodeForNewAddress(), default_country);
 
-  AutofillCountry country(default_country,
-                          g_browser_process->GetApplicationLocale());
+  AutofillCountry country(default_country, "en-US");
   EXPECT_EQ(country.name(), model()->GetItemAt(0));
 }
 
@@ -62,9 +55,9 @@ TEST_F(CountryComboboxModelTest, AllCountriesHaveComponents) {
       continue;
 
     std::string country_code = model()->countries()[i]->country_code();
-    std::vector< ::i18n::addressinput::AddressUiComponent> components =
-        ::i18n::addressinput::BuildComponents(
-            country_code, localization, std::string(), &unused);
+    std::vector<::i18n::addressinput::AddressUiComponent> components =
+        ::i18n::addressinput::BuildComponents(country_code, localization,
+                                              std::string(), &unused);
     EXPECT_FALSE(components.empty()) << " for country " << country_code;
   }
 }