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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/engine/syncer.cc

Issue 10559104: sync: Process 'control' data separately (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename, cleanup, fix tests Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/engine/sync_scheduler_whitebox_unittest.cc ('k') | sync/engine/syncer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/syncer.cc
diff --git a/sync/engine/syncer.cc b/sync/engine/syncer.cc
index 8f87cdafb298a547cc352190828287f89be58924..eb15100254b7def980aa56bad7d32364496489ed 100644
--- a/sync/engine/syncer.cc
+++ b/sync/engine/syncer.cc
@@ -10,6 +10,7 @@
#include "base/message_loop.h"
#include "base/time.h"
#include "build/build_config.h"
+#include "sync/engine/apply_control_data_updates.h"
#include "sync/engine/apply_updates_command.h"
#include "sync/engine/build_commit_command.h"
#include "sync/engine/cleanup_disabled_types_command.h"
@@ -166,6 +167,9 @@ void Syncer::SyncShare(sessions::SyncSession* session,
break;
}
case APPLY_UPDATES: {
+ // These include encryption updates that should be applied early.
+ ApplyControlDataUpdates(session->context()->directory());
+
ApplyUpdatesCommand apply_updates;
apply_updates.Execute(session);
if (last_step == APPLY_UPDATES) {
« no previous file with comments | « sync/engine/sync_scheduler_whitebox_unittest.cc ('k') | sync/engine/syncer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698