| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "chrome/browser/sync/test_profile_sync_service.h" | 5 #include "chrome/browser/sync/test_profile_sync_service.h" |
| 6 | 6 |
| 7 #include "chrome/browser/signin/signin_manager.h" | 7 #include "chrome/browser/signin/signin_manager.h" |
| 8 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" | 8 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" |
| 9 #include "chrome/browser/sync/glue/data_type_controller.h" | 9 #include "chrome/browser/sync/glue/data_type_controller.h" |
| 10 #include "chrome/browser/sync/glue/sync_backend_host.h" | 10 #include "chrome/browser/sync/glue/sync_backend_host.h" |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 if (!fail_initial_download_) | 89 if (!fail_initial_download_) |
| 90 sync_ended.Put(syncable::NIGORI); | 90 sync_ended.Put(syncable::NIGORI); |
| 91 std::string download_progress_markers[syncable::MODEL_TYPE_COUNT]; | 91 std::string download_progress_markers[syncable::MODEL_TYPE_COUNT]; |
| 92 HandleSyncCycleCompletedOnFrontendLoop(new SyncSessionSnapshot( | 92 HandleSyncCycleCompletedOnFrontendLoop(new SyncSessionSnapshot( |
| 93 SyncerStatus(), ErrorCounters(), 0, false, | 93 SyncerStatus(), ErrorCounters(), 0, false, |
| 94 sync_ended, download_progress_markers, false, false, 0, 0, 0, 0, 0, | 94 sync_ended, download_progress_markers, false, false, 0, 0, 0, 0, 0, |
| 95 false, SyncSourceInfo(), 0, base::Time::Now(), false)); | 95 false, SyncSourceInfo(), 0, base::Time::Now(), false)); |
| 96 } | 96 } |
| 97 } | 97 } |
| 98 | 98 |
| 99 void SyncBackendHostForProfileSyncTest:: | |
| 100 SetDefaultExpectationsForWorkerCreation(ProfileMock* profile) { | |
| 101 EXPECT_CALL(*profile, GetPasswordStore(testing::_)). | |
| 102 WillOnce(testing::Return((PasswordStore*)NULL)); | |
| 103 } | |
| 104 | |
| 105 void SyncBackendHostForProfileSyncTest::SetHistoryServiceExpectations( | 99 void SyncBackendHostForProfileSyncTest::SetHistoryServiceExpectations( |
| 106 ProfileMock* profile) { | 100 ProfileMock* profile) { |
| 107 EXPECT_CALL(*profile, GetHistoryService(testing::_)). | 101 EXPECT_CALL(*profile, GetHistoryService(testing::_)). |
| 108 WillOnce(testing::Return((HistoryService*)NULL)); | 102 WillOnce(testing::Return((HistoryService*)NULL)); |
| 109 } | 103 } |
| 110 | 104 |
| 111 } // namespace browser_sync | 105 } // namespace browser_sync |
| 112 | 106 |
| 113 browser_sync::TestIdFactory* TestProfileSyncService::id_factory() { | 107 browser_sync::TestIdFactory* TestProfileSyncService::id_factory() { |
| 114 return &id_factory_; | 108 return &id_factory_; |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 } | 214 } |
| 221 | 215 |
| 222 void TestProfileSyncService::CreateBackend() { | 216 void TestProfileSyncService::CreateBackend() { |
| 223 backend_.reset(new browser_sync::SyncBackendHostForProfileSyncTest( | 217 backend_.reset(new browser_sync::SyncBackendHostForProfileSyncTest( |
| 224 profile(), | 218 profile(), |
| 225 sync_prefs_.AsWeakPtr(), | 219 sync_prefs_.AsWeakPtr(), |
| 226 set_initial_sync_ended_on_init_, | 220 set_initial_sync_ended_on_init_, |
| 227 synchronous_backend_initialization_, | 221 synchronous_backend_initialization_, |
| 228 fail_initial_download_)); | 222 fail_initial_download_)); |
| 229 } | 223 } |
| OLD | NEW |