| 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 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 585 syncer::MakeWeakHandle(debug_ptr_factory_.GetWeakPtr()))); | 585 syncer::MakeWeakHandle(debug_ptr_factory_.GetWeakPtr()))); |
| 586 | 586 |
| 587 EXPECT_CALL(*personal_data_manager_, IsDataLoaded()). | 587 EXPECT_CALL(*personal_data_manager_, IsDataLoaded()). |
| 588 WillRepeatedly(Return(true)); | 588 WillRepeatedly(Return(true)); |
| 589 | 589 |
| 590 // We need tokens to get the tests going | 590 // We need tokens to get the tests going |
| 591 token_service_->IssueAuthTokenForTest(GaiaConstants::kSyncService, "token"); | 591 token_service_->IssueAuthTokenForTest(GaiaConstants::kSyncService, "token"); |
| 592 | 592 |
| 593 sync_service_->RegisterDataTypeController(data_type_controller); | 593 sync_service_->RegisterDataTypeController(data_type_controller); |
| 594 sync_service_->Initialize(); | 594 sync_service_->Initialize(); |
| 595 MessageLoop::current()->Run(); | 595 base::MessageLoop::current()->Run(); |
| 596 | 596 |
| 597 // It's possible this test triggered an unrecoverable error, in which case | 597 // It's possible this test triggered an unrecoverable error, in which case |
| 598 // we can't get the sync count. | 598 // we can't get the sync count. |
| 599 if (sync_service_->ShouldPushChanges()) { | 599 if (sync_service_->ShouldPushChanges()) { |
| 600 EXPECT_EQ(GetSyncCount(type), | 600 EXPECT_EQ(GetSyncCount(type), |
| 601 association_stats_.num_sync_items_after_association); | 601 association_stats_.num_sync_items_after_association); |
| 602 } | 602 } |
| 603 EXPECT_EQ(association_stats_.num_sync_items_after_association, | 603 EXPECT_EQ(association_stats_.num_sync_items_after_association, |
| 604 association_stats_.num_sync_items_before_association + | 604 association_stats_.num_sync_items_before_association + |
| 605 association_stats_.num_sync_items_added - | 605 association_stats_.num_sync_items_added - |
| (...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1402 std::vector<AutofillEntry> sync_entries; | 1402 std::vector<AutofillEntry> sync_entries; |
| 1403 std::vector<AutofillProfile> sync_profiles; | 1403 std::vector<AutofillProfile> sync_profiles; |
| 1404 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); | 1404 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); |
| 1405 EXPECT_EQ(3U, sync_entries.size()); | 1405 EXPECT_EQ(3U, sync_entries.size()); |
| 1406 EXPECT_EQ(0U, sync_profiles.size()); | 1406 EXPECT_EQ(0U, sync_profiles.size()); |
| 1407 for (size_t i = 0; i < sync_entries.size(); i++) { | 1407 for (size_t i = 0; i < sync_entries.size(); i++) { |
| 1408 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() | 1408 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() |
| 1409 << ", " << sync_entries[i].key().value(); | 1409 << ", " << sync_entries[i].key().value(); |
| 1410 } | 1410 } |
| 1411 } | 1411 } |
| OLD | NEW |