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

Side by Side Diff: chrome/browser/sync/glue/sync_backend_host.cc

Issue 10874096: [Sync] Rework Invalidator-related unit tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years, 3 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #include "chrome/browser/sync/glue/sync_backend_host.h" 7 #include "chrome/browser/sync/glue/sync_backend_host.h"
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <map> 10 #include <map>
(...skipping 1240 matching lines...) Expand 10 before | Expand all | Expand 10 after
1251 1251
1252 void SyncBackendHost::Core::DoFinishConfigureDataTypes( 1252 void SyncBackendHost::Core::DoFinishConfigureDataTypes(
1253 syncer::ModelTypeSet types_to_config, 1253 syncer::ModelTypeSet types_to_config,
1254 const base::Callback<void(syncer::ModelTypeSet)>& ready_task) { 1254 const base::Callback<void(syncer::ModelTypeSet)>& ready_task) {
1255 DCHECK_EQ(MessageLoop::current(), sync_loop_); 1255 DCHECK_EQ(MessageLoop::current(), sync_loop_);
1256 1256
1257 // Update the enabled types for the bridge and sync manager. 1257 // Update the enabled types for the bridge and sync manager.
1258 syncer::ModelSafeRoutingInfo routing_info; 1258 syncer::ModelSafeRoutingInfo routing_info;
1259 registrar_->GetModelSafeRoutingInfo(&routing_info); 1259 registrar_->GetModelSafeRoutingInfo(&routing_info);
1260 const syncer::ModelTypeSet enabled_types = GetRoutingInfoTypes(routing_info); 1260 const syncer::ModelTypeSet enabled_types = GetRoutingInfoTypes(routing_info);
1261 chrome_sync_notification_bridge_->UpdateEnabledTypes(enabled_types);
1262 sync_manager_->UpdateEnabledTypes(enabled_types); 1261 sync_manager_->UpdateEnabledTypes(enabled_types);
1263 1262
1264 const syncer::ModelTypeSet failed_configuration_types = 1263 const syncer::ModelTypeSet failed_configuration_types =
1265 Difference(types_to_config, sync_manager_->InitialSyncEndedTypes()); 1264 Difference(types_to_config, sync_manager_->InitialSyncEndedTypes());
1266 host_.Call(FROM_HERE, 1265 host_.Call(FROM_HERE,
1267 &SyncBackendHost::FinishConfigureDataTypesOnFrontendLoop, 1266 &SyncBackendHost::FinishConfigureDataTypesOnFrontendLoop,
1268 failed_configuration_types, 1267 failed_configuration_types,
1269 ready_task); 1268 ready_task);
1270 } 1269 }
1271 1270
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
1548 const syncer::ModelTypeSet failed_configuration_types) { 1547 const syncer::ModelTypeSet failed_configuration_types) {
1549 HandleInitializationCompletedOnFrontendLoop( 1548 HandleInitializationCompletedOnFrontendLoop(
1550 failed_configuration_types.Empty()); 1549 failed_configuration_types.Empty());
1551 } 1550 }
1552 1551
1553 #undef SDVLOG 1552 #undef SDVLOG
1554 1553
1555 #undef SLOG 1554 #undef SLOG
1556 1555
1557 } // namespace browser_sync 1556 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698