[Sync] Make BackendMigrator not wait for full sync cycles

chrome/browser/sync/glue/sync_backend_registrar.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/glue/sync_backend_registrar.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 28 matching lines @@
       return true;
     case MODEL_SAFE_GROUP_COUNT:
     default:
       return false;
   }
 }
 
 }  // namespace
 
 SyncBackendRegistrar::SyncBackendRegistrar(
-    const syncable::ModelTypeSet& initial_types, Profile* profile,
+    const syncable::ModelTypeSet& initial_types,
+    const std::string& name, Profile* profile,
     MessageLoop* sync_loop) :
+    name_(name),
     profile_(profile),
     sync_loop_(sync_loop),
     ui_worker_(new UIModelWorker()),
     stopped_on_ui_thread_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   CHECK(profile_);
   DCHECK(sync_loop_);
   workers_[GROUP_DB] = new DatabaseModelWorker();
   workers_[GROUP_UI] = ui_worker_;
   workers_[GROUP_PASSIVE] = new ModelSafeWorker();
@@ skipping 69 matching lines @@
     // routing_info, if it does not already exist.
     if (routing_info_.count(*it) == 0) {
       routing_info_[*it] = GROUP_PASSIVE;
       newly_added_types.insert(*it);
     }
   }
   for (syncable::ModelTypeSet::const_iterator it = types_to_remove.begin();
        it != types_to_remove.end(); ++it) {
     routing_info_.erase(*it);
   }
+
+  // TODO(akalin): Use SVLOG/SLOG if we add any more logging.
+  VLOG(1) << name_ << ": Adding types "
+          << syncable::ModelTypeSetToString(types_to_add)
+          << " (with newly-added types "
+          << syncable::ModelTypeSetToString(newly_added_types)
+          << ") and removing types "
+          << syncable::ModelTypeSetToString(types_to_remove)
+          << " to get new routing info "
+          << ModelSafeRoutingInfoToString(routing_info_);
+
   return newly_added_types;
 }
 
 void SyncBackendRegistrar::StopOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!stopped_on_ui_thread_);
   ui_worker_->Stop();
   stopped_on_ui_thread_ = true;
 }
 
@@ skipping 88 matching lines @@
 }
 
 bool SyncBackendRegistrar::IsCurrentThreadSafeForModel(
     syncable::ModelType model_type) const {
   lock_.AssertAcquired();
   return IsOnThreadForGroup(GetGroupForModelType(model_type, routing_info_));
 }
 
 }  // namespace browser_sync