| 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 } | 143 } |
| 144 | 144 |
| 145 if (!directory->InitialSyncEndedForType(DEVICE_INFO)) { | 145 if (!directory->InitialSyncEndedForType(DEVICE_INFO)) { |
| 146 syncer::TestUserShare::CreateRoot(DEVICE_INFO, user_share); | 146 syncer::TestUserShare::CreateRoot(DEVICE_INFO, user_share); |
| 147 } | 147 } |
| 148 | 148 |
| 149 if (!directory->InitialSyncEndedForType(EXPERIMENTS)) { | 149 if (!directory->InitialSyncEndedForType(EXPERIMENTS)) { |
| 150 syncer::TestUserShare::CreateRoot(EXPERIMENTS, user_share); | 150 syncer::TestUserShare::CreateRoot(EXPERIMENTS, user_share); |
| 151 } | 151 } |
| 152 | 152 |
| 153 if (!directory->InitialSyncEndedForType(PRIORITY_PREFERENCES)) { | |
| 154 syncer::TestUserShare::CreateRoot(PRIORITY_PREFERENCES, user_share); | |
| 155 } | |
| 156 | |
| 157 restored_types = syncer::ModelTypeSet::All(); | 153 restored_types = syncer::ModelTypeSet::All(); |
| 158 } | 154 } |
| 159 | 155 |
| 160 initial_download_closure_ = base::Bind( | 156 initial_download_closure_ = base::Bind( |
| 161 &SyncBackendHostForProfileSyncTest::ContinueInitialization, | 157 &SyncBackendHostForProfileSyncTest::ContinueInitialization, |
| 162 weak_ptr_factory_.GetWeakPtr(), | 158 weak_ptr_factory_.GetWeakPtr(), |
| 163 js_backend, | 159 js_backend, |
| 164 debug_info_listener, | 160 debug_info_listener, |
| 165 restored_types); | 161 restored_types); |
| 166 if (fail_initial_download_) { | 162 if (fail_initial_download_) { |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 profile(), | 283 profile(), |
| 288 sync_prefs_.AsWeakPtr(), | 284 sync_prefs_.AsWeakPtr(), |
| 289 invalidator_storage_.AsWeakPtr(), | 285 invalidator_storage_.AsWeakPtr(), |
| 290 id_factory_, | 286 id_factory_, |
| 291 callback_, | 287 callback_, |
| 292 set_initial_sync_ended_on_init_, | 288 set_initial_sync_ended_on_init_, |
| 293 synchronous_backend_initialization_, | 289 synchronous_backend_initialization_, |
| 294 fail_initial_download_, | 290 fail_initial_download_, |
| 295 storage_option_)); | 291 storage_option_)); |
| 296 } | 292 } |
| OLD | NEW |