OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "base/test/histogram_tester.h" | 9 #include "base/test/histogram_tester.h" |
10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
12 #include "chrome/browser/prefs/pref_service_syncable.h" | 12 #include "chrome/browser/prefs/pref_service_syncable.h" |
13 #include "chrome/browser/signin/account_reconcilor_factory.h" | 13 #include "chrome/browser/signin/account_reconcilor_factory.h" |
14 #include "chrome/browser/signin/account_tracker_service_factory.h" | 14 #include "chrome/browser/signin/account_tracker_service_factory.h" |
15 #include "chrome/browser/signin/chrome_signin_client_factory.h" | 15 #include "chrome/browser/signin/chrome_signin_client_factory.h" |
16 #include "chrome/browser/signin/fake_gaia_cookie_manager_service.h" | 16 #include "chrome/browser/signin/fake_gaia_cookie_manager_service.h" |
17 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" | 17 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" |
18 #include "chrome/browser/signin/fake_signin_manager.h" | 18 #include "chrome/browser/signin/fake_signin_manager_builder.h" |
19 #include "chrome/browser/signin/gaia_cookie_manager_service_factory.h" | 19 #include "chrome/browser/signin/gaia_cookie_manager_service_factory.h" |
20 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 20 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
21 #include "chrome/browser/signin/signin_manager_factory.h" | 21 #include "chrome/browser/signin/signin_manager_factory.h" |
22 #include "chrome/browser/signin/test_signin_client_builder.h" | 22 #include "chrome/browser/signin/test_signin_client_builder.h" |
23 #include "chrome/test/base/testing_browser_process.h" | 23 #include "chrome/test/base/testing_browser_process.h" |
24 #include "chrome/test/base/testing_profile.h" | 24 #include "chrome/test/base/testing_profile.h" |
25 #include "chrome/test/base/testing_profile_manager.h" | 25 #include "chrome/test/base/testing_profile_manager.h" |
26 #include "components/signin/core/browser/account_reconcilor.h" | 26 #include "components/signin/core/browser/account_reconcilor.h" |
27 #include "components/signin/core/browser/account_tracker_service.h" | 27 #include "components/signin/core/browser/account_tracker_service.h" |
28 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" | 28 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
167 TestingProfile::TestingFactories factories; | 167 TestingProfile::TestingFactories factories; |
168 factories.push_back(std::make_pair(ChromeSigninClientFactory::GetInstance(), | 168 factories.push_back(std::make_pair(ChromeSigninClientFactory::GetInstance(), |
169 signin::BuildTestSigninClient)); | 169 signin::BuildTestSigninClient)); |
170 factories.push_back(std::make_pair( | 170 factories.push_back(std::make_pair( |
171 ProfileOAuth2TokenServiceFactory::GetInstance(), | 171 ProfileOAuth2TokenServiceFactory::GetInstance(), |
172 BuildFakeProfileOAuth2TokenService)); | 172 BuildFakeProfileOAuth2TokenService)); |
173 factories.push_back(std::make_pair( | 173 factories.push_back(std::make_pair( |
174 GaiaCookieManagerServiceFactory::GetInstance(), | 174 GaiaCookieManagerServiceFactory::GetInstance(), |
175 FakeGaiaCookieManagerService::Build)); | 175 FakeGaiaCookieManagerService::Build)); |
176 factories.push_back(std::make_pair(SigninManagerFactory::GetInstance(), | 176 factories.push_back(std::make_pair(SigninManagerFactory::GetInstance(), |
177 FakeSigninManagerBase::Build)); | 177 BuildFakeSigninManagerBase)); |
178 factories.push_back(std::make_pair(AccountReconcilorFactory::GetInstance(), | 178 factories.push_back(std::make_pair(AccountReconcilorFactory::GetInstance(), |
179 MockAccountReconcilor::Build)); | 179 MockAccountReconcilor::Build)); |
180 | 180 |
181 profile_ = testing_profile_manager_.get()->CreateTestingProfile("name", | 181 profile_ = testing_profile_manager_.get()->CreateTestingProfile("name", |
182 scoped_ptr<PrefServiceSyncable>(), | 182 scoped_ptr<PrefServiceSyncable>(), |
183 base::UTF8ToUTF16("name"), 0, std::string(), | 183 base::UTF8ToUTF16("name"), 0, std::string(), |
184 factories); | 184 factories); |
185 | 185 |
186 test_signin_client_ = | 186 test_signin_client_ = |
187 static_cast<TestSigninClient*>( | 187 static_cast<TestSigninClient*>( |
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
758 ASSERT_TRUE(reconcilor->is_reconcile_started_); | 758 ASSERT_TRUE(reconcilor->is_reconcile_started_); |
759 | 759 |
760 SimulateAddAccountToCookieCompleted(reconcilor, account_id, | 760 SimulateAddAccountToCookieCompleted(reconcilor, account_id, |
761 GoogleServiceAuthError::AuthErrorNone()); | 761 GoogleServiceAuthError::AuthErrorNone()); |
762 ASSERT_FALSE(reconcilor->is_reconcile_started_); | 762 ASSERT_FALSE(reconcilor->is_reconcile_started_); |
763 } | 763 } |
764 | 764 |
765 INSTANTIATE_TEST_CASE_P(AccountReconcilorMaybeEnabled, | 765 INSTANTIATE_TEST_CASE_P(AccountReconcilorMaybeEnabled, |
766 AccountReconcilorTest, | 766 AccountReconcilorTest, |
767 testing::Bool()); | 767 testing::Bool()); |
OLD | NEW |