Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Side by Side Diff: chrome/browser/sync/test_profile_sync_service.cc

Issue 10817023: [Sync] Pass the correct set of enabled types to the sync notifier (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 MessageLoop::current()->Run(); 79 MessageLoop::current()->Run();
80 } 80 }
81 } 81 }
82 82
83 void SyncBackendHostForProfileSyncTest::RequestConfigureSyncer( 83 void SyncBackendHostForProfileSyncTest::RequestConfigureSyncer(
84 syncer::ConfigureReason reason, 84 syncer::ConfigureReason reason,
85 syncer::ModelTypeSet types_to_config, 85 syncer::ModelTypeSet types_to_config,
86 const syncer::ModelSafeRoutingInfo& routing_info, 86 const syncer::ModelSafeRoutingInfo& routing_info,
87 const base::Callback<void(syncer::ModelTypeSet)>& ready_task, 87 const base::Callback<void(syncer::ModelTypeSet)>& ready_task,
88 const base::Closure& retry_callback) { 88 const base::Closure& retry_callback) {
89 syncer::ModelTypeSet sync_ended; 89 syncer::ModelTypeSet failed_configuration_types;
90 if (!fail_initial_download_) 90 if (fail_initial_download_)
91 sync_ended.PutAll(types_to_config); 91 failed_configuration_types = types_to_config;
92 92
93 FinishConfigureDataTypesOnFrontendLoop(types_to_config, 93 FinishConfigureDataTypesOnFrontendLoop(failed_configuration_types,
94 sync_ended,
95 ready_task); 94 ready_task);
96 } 95 }
97 96
98 } // namespace browser_sync 97 } // namespace browser_sync
99 98
100 syncer::TestIdFactory* TestProfileSyncService::id_factory() { 99 syncer::TestIdFactory* TestProfileSyncService::id_factory() {
101 return &id_factory_; 100 return &id_factory_;
102 } 101 }
103 102
104 browser_sync::SyncBackendHostForProfileSyncTest* 103 browser_sync::SyncBackendHostForProfileSyncTest*
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 void TestProfileSyncService::CreateBackend() { 212 void TestProfileSyncService::CreateBackend() {
214 backend_.reset(new browser_sync::SyncBackendHostForProfileSyncTest( 213 backend_.reset(new browser_sync::SyncBackendHostForProfileSyncTest(
215 profile(), 214 profile(),
216 sync_prefs_.AsWeakPtr(), 215 sync_prefs_.AsWeakPtr(),
217 invalidator_storage_.AsWeakPtr(), 216 invalidator_storage_.AsWeakPtr(),
218 set_initial_sync_ended_on_init_, 217 set_initial_sync_ended_on_init_,
219 synchronous_backend_initialization_, 218 synchronous_backend_initialization_,
220 fail_initial_download_, 219 fail_initial_download_,
221 use_real_database_)); 220 use_real_database_));
222 } 221 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/sync_backend_host_unittest.cc ('k') | sync/internal_api/public/test/fake_sync_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698