Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(284)

Side by Side Diff: chrome/browser/ui/autofill/country_combobox_model_unittest.cc

Issue 2705773002: [Autofill] Move country combo box model from chrome to component. (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/autofill/country_combobox_model.h" 5 #include "components/autofill/core/browser/country_combobox_model.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/signin/account_tracker_service_factory.h" 10 #include "chrome/browser/signin/account_tracker_service_factory.h"
11 #include "chrome/browser/signin/signin_manager_factory.h" 11 #include "chrome/browser/signin/signin_manager_factory.h"
12 #include "chrome/test/base/testing_profile.h" 12 #include "chrome/test/base/testing_profile.h"
13 #include "components/autofill/core/browser/autofill_country.h" 13 #include "components/autofill/core/browser/autofill_country.h"
14 #include "components/autofill/core/browser/test_personal_data_manager.h" 14 #include "components/autofill/core/browser/test_personal_data_manager.h"
15 #include "components/signin/core/browser/account_tracker_service.h" 15 #include "components/signin/core/browser/account_tracker_service.h"
16 #include "components/signin/core/browser/signin_manager.h" 16 #include "components/signin/core/browser/signin_manager.h"
17 #include "content/public/test/test_browser_thread_bundle.h" 17 #include "content/public/test/test_browser_thread_bundle.h"
18 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
19 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui .h" 19 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui .h"
20 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui _component.h" 20 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui _component.h"
21 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/localizati on.h" 21 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/localizati on.h"
22 22
23 namespace autofill { 23 namespace autofill {
24 24
25 class CountryComboboxModelTest : public testing::Test { 25 class CountryComboboxModelTest : public testing::Test {
26 public: 26 public:
27 CountryComboboxModelTest() { 27 CountryComboboxModelTest() {
28 manager_.Init( 28 manager_.Init(
Mathieu 2017/02/21 00:57:19 Do we need lines 28-31? If not, that means we can
MAD 2017/02/21 15:56:18 It could be replaced with a mock.
29 NULL, profile_.GetPrefs(), 29 NULL, profile_.GetPrefs(),
30 AccountTrackerServiceFactory::GetForProfile(&profile_), 30 AccountTrackerServiceFactory::GetForProfile(&profile_),
31 SigninManagerFactory::GetForProfile(&profile_), false); 31 SigninManagerFactory::GetForProfile(&profile_), false);
32 manager_.set_timezone_country_code("KR"); 32 manager_.set_timezone_country_code("KR");
33 model_.reset(new CountryComboboxModel()); 33 model_.reset(new CountryComboboxModel());
34 model_->SetCountries(manager_, base::Callback<bool(const std::string&)>()); 34 model_->SetCountries(manager_, base::Callback<bool(const std::string&)>(),
35 g_browser_process->GetApplicationLocale());
Mathieu 2017/02/21 00:57:19 It seems like we are testing "KR" - Korea, above.
MAD 2017/02/21 15:56:18 It's a bit weird that it works with the browser pr
35 } 36 }
36 37
37 TestPersonalDataManager* manager() { return &manager_; } 38 TestPersonalDataManager* manager() { return &manager_; }
38 CountryComboboxModel* model() { return model_.get(); } 39 CountryComboboxModel* model() { return model_.get(); }
39 40
40 private: 41 private:
41 // NB: order is important here - |profile_| must go down after |manager_|. 42 // NB: order is important here - |profile_| must go down after |manager_|.
42 content::TestBrowserThreadBundle thread_bundle_; 43 content::TestBrowserThreadBundle thread_bundle_;
43 TestingProfile profile_; 44 TestingProfile profile_;
44 TestPersonalDataManager manager_; 45 TestPersonalDataManager manager_;
(...skipping 18 matching lines...) Expand all
63 64
64 std::string country_code = model()->countries()[i]->country_code(); 65 std::string country_code = model()->countries()[i]->country_code();
65 std::vector< ::i18n::addressinput::AddressUiComponent> components = 66 std::vector< ::i18n::addressinput::AddressUiComponent> components =
66 ::i18n::addressinput::BuildComponents( 67 ::i18n::addressinput::BuildComponents(
67 country_code, localization, std::string(), &unused); 68 country_code, localization, std::string(), &unused);
68 EXPECT_FALSE(components.empty()) << " for country " << country_code; 69 EXPECT_FALSE(components.empty()) << " for country " << country_code;
69 } 70 }
70 } 71 }
71 72
72 } // namespace autofill 73 } // namespace autofill
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698