sync: Add pre-commit update avoidance mode + flag

sync/engine/syncer.cc

Index: sync/engine/syncer.cc
diff --git a/sync/engine/syncer.cc b/sync/engine/syncer.cc
index 9b1adb3791e0c84f5ea4a0c26d54a5f88a91cb5b..8992496cdf149e9a7554fdc41bc33da22efcec00 100644
--- a/sync/engine/syncer.cc
+++ b/sync/engine/syncer.cc
@@ -64,14 +64,17 @@ bool Syncer::NormalSyncShare(ModelTypeSet request_types,
                              SyncSession* session) {
   HandleCycleBegin(session);
   VLOG(1) << "Downloading types " << ModelTypeSetToString(request_types);
-  if (!DownloadAndApplyUpdates(
-          session,
-          base::Bind(&NormalDownloadUpdates,
-                     session,
-                     kCreateMobileBookmarksFolder,
-                     request_types,
-                     base::ConstRef(nudge_tracker)))) {
-    return HandleCycleEnd(session);
+  if (nudge_tracker.IsGetUpdatesRequired()
+      || session->context()->should_fetch_updates_before_commit()) {

[Nicolas Zea, 2013/07/16 00:24:32]

|| on previous line

[rlarocque, 2013/07/16 01:08:27]

Done.

+    if (!DownloadAndApplyUpdates(
+            session,
+            base::Bind(&NormalDownloadUpdates,
+                       session,
+                       kCreateMobileBookmarksFolder,
+                       request_types,
+                       base::ConstRef(nudge_tracker)))) {
+      return HandleCycleEnd(session);
+    }
   }
 
   VLOG(1) << "Committing from types " << ModelTypeSetToString(request_types);