OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 <set> | 5 #include <set> |
6 #include <string> | 6 #include <string> |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
10 | 10 |
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
519 static_cast<MockPersonalDataManagerService*>( | 519 static_cast<MockPersonalDataManagerService*>( |
520 autofill::PersonalDataManagerFactory::GetInstance() | 520 autofill::PersonalDataManagerFactory::GetInstance() |
521 ->SetTestingFactoryAndUse( | 521 ->SetTestingFactoryAndUse( |
522 profile_.get(), MockPersonalDataManagerService::Build)); | 522 profile_.get(), MockPersonalDataManagerService::Build)); |
523 personal_data_manager_ = | 523 personal_data_manager_ = |
524 personal_data_manager_service->GetPersonalDataManager(); | 524 personal_data_manager_service->GetPersonalDataManager(); |
525 | 525 |
526 token_service_ = static_cast<TokenService*>( | 526 token_service_ = static_cast<TokenService*>( |
527 TokenServiceFactory::GetInstance()->SetTestingFactoryAndUse( | 527 TokenServiceFactory::GetInstance()->SetTestingFactoryAndUse( |
528 profile_.get(), BuildTokenService)); | 528 profile_.get(), BuildTokenService)); |
| 529 ProfileOAuth2TokenServiceFactory::GetInstance()->SetTestingFactory( |
| 530 profile_.get(), FakeOAuth2TokenService::BuildTokenService); |
529 EXPECT_CALL(*personal_data_manager_, LoadProfiles()).Times(1); | 531 EXPECT_CALL(*personal_data_manager_, LoadProfiles()).Times(1); |
530 EXPECT_CALL(*personal_data_manager_, LoadCreditCards()).Times(1); | 532 EXPECT_CALL(*personal_data_manager_, LoadCreditCards()).Times(1); |
531 | 533 |
532 personal_data_manager_->Init(profile_.get()); | 534 personal_data_manager_->Init(profile_.get()); |
533 | 535 |
534 web_data_service_->StartSyncableService(); | 536 web_data_service_->StartSyncableService(); |
535 } | 537 } |
536 | 538 |
537 virtual void TearDown() OVERRIDE { | 539 virtual void TearDown() OVERRIDE { |
538 // Note: The tear down order is important. | 540 // Note: The tear down order is important. |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
581 data_type_controller); | 583 data_type_controller); |
582 | 584 |
583 EXPECT_CALL(*components, CreateDataTypeManager(_, _, _, _, _)). | 585 EXPECT_CALL(*components, CreateDataTypeManager(_, _, _, _, _)). |
584 WillOnce(ReturnNewDataTypeManagerWithDebugListener( | 586 WillOnce(ReturnNewDataTypeManagerWithDebugListener( |
585 syncer::MakeWeakHandle(debug_ptr_factory_.GetWeakPtr()))); | 587 syncer::MakeWeakHandle(debug_ptr_factory_.GetWeakPtr()))); |
586 | 588 |
587 EXPECT_CALL(*personal_data_manager_, IsDataLoaded()). | 589 EXPECT_CALL(*personal_data_manager_, IsDataLoaded()). |
588 WillRepeatedly(Return(true)); | 590 WillRepeatedly(Return(true)); |
589 | 591 |
590 // We need tokens to get the tests going | 592 // We need tokens to get the tests going |
591 token_service_->IssueAuthTokenForTest(GaiaConstants::kSyncService, "token"); | 593 token_service_->IssueAuthTokenForTest( |
| 594 GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token"); |
592 | 595 |
593 sync_service_->RegisterDataTypeController(data_type_controller); | 596 sync_service_->RegisterDataTypeController(data_type_controller); |
594 sync_service_->Initialize(); | 597 sync_service_->Initialize(); |
595 base::MessageLoop::current()->Run(); | 598 base::MessageLoop::current()->Run(); |
596 | 599 |
597 // It's possible this test triggered an unrecoverable error, in which case | 600 // It's possible this test triggered an unrecoverable error, in which case |
598 // we can't get the sync count. | 601 // we can't get the sync count. |
599 if (sync_service_->ShouldPushChanges()) { | 602 if (sync_service_->ShouldPushChanges()) { |
600 EXPECT_EQ(GetSyncCount(type), | 603 EXPECT_EQ(GetSyncCount(type), |
601 association_stats_.num_sync_items_after_association); | 604 association_stats_.num_sync_items_after_association); |
(...skipping 800 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1402 std::vector<AutofillEntry> sync_entries; | 1405 std::vector<AutofillEntry> sync_entries; |
1403 std::vector<AutofillProfile> sync_profiles; | 1406 std::vector<AutofillProfile> sync_profiles; |
1404 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); | 1407 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); |
1405 EXPECT_EQ(3U, sync_entries.size()); | 1408 EXPECT_EQ(3U, sync_entries.size()); |
1406 EXPECT_EQ(0U, sync_profiles.size()); | 1409 EXPECT_EQ(0U, sync_profiles.size()); |
1407 for (size_t i = 0; i < sync_entries.size(); i++) { | 1410 for (size_t i = 0; i < sync_entries.size(); i++) { |
1408 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() | 1411 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() |
1409 << ", " << sync_entries[i].key().value(); | 1412 << ", " << sync_entries[i].key().value(); |
1410 } | 1413 } |
1411 } | 1414 } |
OLD | NEW |