| Index: chrome/browser/sync/glue/password_data_type_controller.cc
|
| diff --git a/chrome/browser/sync/glue/password_data_type_controller.cc b/chrome/browser/sync/glue/password_data_type_controller.cc
|
| index c48386077ced4614d367446e4d3b5fd85085bb89..fd8cd12d185f284a831a9d82b84abb034bef8618 100644
|
| --- a/chrome/browser/sync/glue/password_data_type_controller.cc
|
| +++ b/chrome/browser/sync/glue/password_data_type_controller.cc
|
| @@ -53,7 +53,14 @@ void PasswordDataTypeController::Start(StartCallback* start_callback) {
|
|
|
| set_state(ASSOCIATING);
|
| password_store_ = profile_->GetPasswordStore(Profile::EXPLICIT_ACCESS);
|
| - DCHECK(password_store_.get());
|
| + if (!password_store_.get()) {
|
| + LOG(ERROR) << "PasswordStore not initialized, password datatype controller"
|
| + << " aborting.";
|
| + state_ = NOT_RUNNING;
|
| + start_callback->Run(ABORTED);
|
| + delete start_callback;
|
| + return;
|
| + }
|
| password_store_->ScheduleTask(
|
| NewRunnableMethod(this, &PasswordDataTypeController::StartImpl));
|
| }
|
|
|