Merge 73754 - [SYNC] Fix handling of password store corruption....

chrome/browser/sync/glue/sync_backend_host.cc

Index: chrome/browser/sync/glue/sync_backend_host.cc
===================================================================
--- chrome/browser/sync/glue/sync_backend_host.cc	(revision 75503)
+++ chrome/browser/sync/glue/sync_backend_host.cc	(working copy)
@@ -106,6 +106,14 @@
             profile_->GetHistoryService(Profile::IMPLICIT_ACCESS));
   }
 
+  // Any datatypes that we want the syncer to pull down must
+  // be in the routing_info map.  We set them to group passive, meaning that
+  // updates will be applied, but not dispatched to the UI thread yet.
+  for (syncable::ModelTypeSet::const_iterator it = types.begin();
+      it != types.end(); ++it) {
+    registrar_.routing_info[(*it)] = GROUP_PASSIVE;
+  }
+
   PasswordStore* password_store =
       profile_->GetPasswordStore(Profile::IMPLICIT_ACCESS);
   if (password_store) {
@@ -113,16 +121,9 @@
         new PasswordModelWorker(password_store);
   } else {
     LOG(WARNING) << "Password store not initialized, cannot sync passwords";
+    registrar_.routing_info.erase(syncable::PASSWORDS);
   }
 
-  // Any datatypes that we want the syncer to pull down must
-  // be in the routing_info map.  We set them to group passive, meaning that
-  // updates will be applied, but not dispatched to the UI thread yet.
-  for (syncable::ModelTypeSet::const_iterator it = types.begin();
-      it != types.end(); ++it) {
-    registrar_.routing_info[(*it)] = GROUP_PASSIVE;
-  }
-
   // TODO(tim): Remove this special case once NIGORI is populated by
   // default.  We piggy back off of the passwords flag for now to not
   // require both encryption and passwords flags.