diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:07 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:07 +0100 |
| commit | 7d4cd473f85ac64c3747c96c277f9e506a0d2246 (patch) | |
| tree | f5fecd524f5ac22cd38bcc6713b81f666730d5a1 /chrome/browser/sync/profile_sync_service_autofill_unittest.cc | |
| parent | 84f2b2352908c30e40ae12ffe850dd8470f6c048 (diff) | |
| download | chromium_org-7d4cd473f85ac64c3747c96c277f9e506a0d2246.tar.gz | |
Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_autofill_unittest.cc')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_autofill_unittest.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc index f32b7e2c06..8fa2fea2a9 100644 --- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc @@ -525,6 +525,8 @@ class ProfileSyncServiceAutofillTest token_service_ = static_cast<TokenService*>( TokenServiceFactory::GetInstance()->SetTestingFactoryAndUse( profile_.get(), BuildTokenService)); + ProfileOAuth2TokenServiceFactory::GetInstance()->SetTestingFactory( + profile_.get(), FakeOAuth2TokenService::BuildTokenService); EXPECT_CALL(*personal_data_manager_, LoadProfiles()).Times(1); EXPECT_CALL(*personal_data_manager_, LoadCreditCards()).Times(1); @@ -588,7 +590,10 @@ class ProfileSyncServiceAutofillTest WillRepeatedly(Return(true)); // We need tokens to get the tests going - token_service_->IssueAuthTokenForTest(GaiaConstants::kSyncService, "token"); + token_service_->IssueAuthTokenForTest( + GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token"); + token_service_->IssueAuthTokenForTest( + GaiaConstants::kSyncService, "token"); sync_service_->RegisterDataTypeController(data_type_controller); sync_service_->Initialize(); @@ -935,7 +940,7 @@ bool IncludesField(const AutofillProfile& profile1, return true; } -}; +} // namespace // TODO(skrul): Test abort startup. // TODO(skrul): Test processing of cloud changes. |