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

chrome/browser/sync/glue/password_data_type_controller.cc

Index: chrome/browser/sync/glue/password_data_type_controller.cc
===================================================================
--- chrome/browser/sync/glue/password_data_type_controller.cc	(revision 75503)
+++ chrome/browser/sync/glue/password_data_type_controller.cc	(working copy)
@@ -43,6 +43,16 @@
     return;
   }
 
+  password_store_ = profile_->GetPasswordStore(Profile::EXPLICIT_ACCESS);
+  if (!password_store_.get()) {
+    LOG(ERROR) << "PasswordStore not initialized, password datatype controller"
+        << " aborting.";
+    state_ = NOT_RUNNING;
+    start_callback->Run(ABORTED);
+    delete start_callback;
+    return;
+  }
+
   if (!sync_service_->IsCryptographerReady()) {
     start_callback->Run(NEEDS_CRYPTO);
     delete start_callback;
@@ -50,10 +60,7 @@
   }
 
   start_callback_.reset(start_callback);
-
   set_state(ASSOCIATING);
-  password_store_ = profile_->GetPasswordStore(Profile::EXPLICIT_ACCESS);
-  DCHECK(password_store_.get());
   password_store_->ScheduleTask(
       NewRunnableMethod(this, &PasswordDataTypeController::StartImpl));
 }