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/signin/signin_manager_factory.h" | 8 #include "chrome/browser/signin/signin_manager_factory.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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 // If we had failed the initial download, complete initialization now. | 97 // If we had failed the initial download, complete initialization now. |
98 if (!initial_download_closure_.is_null()) { | 98 if (!initial_download_closure_.is_null()) { |
99 initial_download_closure_.Run(); | 99 initial_download_closure_.Run(); |
100 initial_download_closure_.Reset(); | 100 initial_download_closure_.Reset(); |
101 } | 101 } |
102 } | 102 } |
103 | 103 |
104 void SyncBackendHostForProfileSyncTest::RequestConfigureSyncer( | 104 void SyncBackendHostForProfileSyncTest::RequestConfigureSyncer( |
105 syncer::ConfigureReason reason, | 105 syncer::ConfigureReason reason, |
106 syncer::ModelTypeSet to_download, | 106 syncer::ModelTypeSet to_download, |
| 107 syncer::ModelTypeSet to_purge, |
107 syncer::ModelTypeSet to_journal, | 108 syncer::ModelTypeSet to_journal, |
108 syncer::ModelTypeSet to_unapply, | 109 syncer::ModelTypeSet to_unapply, |
109 syncer::ModelTypeSet to_ignore, | 110 syncer::ModelTypeSet to_ignore, |
110 const syncer::ModelSafeRoutingInfo& routing_info, | 111 const syncer::ModelSafeRoutingInfo& routing_info, |
111 const base::Callback<void(syncer::ModelTypeSet, | 112 const base::Callback<void(syncer::ModelTypeSet, |
112 syncer::ModelTypeSet)>& ready_task, | 113 syncer::ModelTypeSet)>& ready_task, |
113 const base::Closure& retry_callback) { | 114 const base::Closure& retry_callback) { |
114 syncer::ModelTypeSet failed_configuration_types; | 115 syncer::ModelTypeSet failed_configuration_types; |
115 if (fail_initial_download_) | 116 if (fail_initial_download_) |
116 failed_configuration_types = to_download; | 117 failed_configuration_types = to_download; |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
294 profile(), | 295 profile(), |
295 sync_prefs_.AsWeakPtr(), | 296 sync_prefs_.AsWeakPtr(), |
296 invalidator_storage_.AsWeakPtr(), | 297 invalidator_storage_.AsWeakPtr(), |
297 id_factory_, | 298 id_factory_, |
298 callback_, | 299 callback_, |
299 set_initial_sync_ended_on_init_, | 300 set_initial_sync_ended_on_init_, |
300 synchronous_backend_initialization_, | 301 synchronous_backend_initialization_, |
301 fail_initial_download_, | 302 fail_initial_download_, |
302 storage_option_)); | 303 storage_option_)); |
303 } | 304 } |
OLD | NEW |