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

chrome/browser/sync/glue/sync_backend_host.cc

 // Copyright (c) 2010 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 "build/build_config.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "base/command_line.h"
@@ skipping 88 matching lines @@
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableSyncTypedUrls) || types.count(syncable::TYPED_URLS)) {
     // TODO(tim): Bug 53916.  HistoryModelWorker crashes, so avoid adding it
     // unless specifically requested until bug is fixed.
     registrar_.workers[GROUP_HISTORY] =
         new HistoryModelWorker(
             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) {
     registrar_.workers[GROUP_PASSWORD] =
         new PasswordModelWorker(password_store);
   } else {
     LOG(WARNING) << "Password store not initialized, cannot sync 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;
+    registrar_.routing_info.erase(syncable::PASSWORDS);
   }
 
   // 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.
   bool enable_encryption = !CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableSyncPasswords) || types.count(syncable::PASSWORDS);
   if (enable_encryption)
     registrar_.routing_info[syncable::NIGORI] = GROUP_PASSIVE;
 
@@ skipping 759 matching lines @@
 }
 
 void SyncBackendHost::Core::DeleteSyncDataFolder() {
   if (file_util::DirectoryExists(host_->sync_data_folder_path())) {
     if (!file_util::Delete(host_->sync_data_folder_path(), true))
       LOG(DFATAL) << "Could not delete the Sync Data folder.";
   }
 }
 
 }  // namespace browser_sync