[Sync] Make BackendMigrator not wait for full sync cycles

chrome/browser/sync/sessions/sync_session.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/sessions/sync_session.h"
 
 #include <algorithm>
 
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/model_type.h"
@@ skipping 77 matching lines @@
 
 SyncSessionSnapshot SyncSession::TakeSnapshot() const {
   syncable::ScopedDirLookup dir(context_->directory_manager(),
                                 context_->account_name());
   if (!dir.good())
     LOG(ERROR) << "Scoped dir lookup failed!";
 
   bool is_share_useable = true;
   syncable::ModelTypeBitSet initial_sync_ended;
   std::string download_progress_markers[syncable::MODEL_TYPE_COUNT];
-  for (int i = 0; i < syncable::MODEL_TYPE_COUNT; ++i) {
+  for (int i = syncable::FIRST_REAL_MODEL_TYPE;
+       i < syncable::MODEL_TYPE_COUNT; ++i) {
     syncable::ModelType type(syncable::ModelTypeFromInt(i));
     if (routing_info_.count(type) != 0) {
       if (dir->initial_sync_ended_for_type(type))
         initial_sync_ended.set(type);
       else
         is_share_useable = false;
-      dir->GetDownloadProgressAsString(type, &download_progress_markers[i]);
     }
+    dir->GetDownloadProgressAsString(type, &download_progress_markers[i]);
   }
 
   return SyncSessionSnapshot(
       status_controller_->syncer_status(),
       status_controller_->error(),
       status_controller_->num_server_changes_remaining(),
       is_share_useable,
       initial_sync_ended,
       download_progress_markers,
       HasMoreToSync(),
@@ skipping 20 matching lines @@
   return ((status->commit_ids().size() < status->unsynced_handles().size()) &&
       status->syncer_status().num_successful_commits > 0) ||
       status->conflict_sets_built() ||
       status->conflicts_resolved();
       // Or, we have conflicting updates, but we're making progress on
       // resolving them...
   }
 
 }  // namespace sessions
 }  // namespace browser_sync