| Index: chrome/browser/chromeos/settings/device_settings_service.cc
|
| diff --git a/chrome/browser/chromeos/settings/device_settings_service.cc b/chrome/browser/chromeos/settings/device_settings_service.cc
|
| index fb1638d4eab19bec8ddc8e0f1bd8968c4a66e752..ebaf0c9ffd1a01c21942c6add6d157aa43843dea 100644
|
| --- a/chrome/browser/chromeos/settings/device_settings_service.cc
|
| +++ b/chrome/browser/chromeos/settings/device_settings_service.cc
|
| @@ -85,7 +85,8 @@ void DeviceSettingsService::Shutdown() {
|
| pending_operations_.end());
|
| pending_operations_.clear();
|
|
|
| - session_manager_client_->RemoveObserver(this);
|
| + if (session_manager_client_)
|
| + session_manager_client_->RemoveObserver(this);
|
| session_manager_client_ = NULL;
|
| owner_key_util_ = NULL;
|
| }
|
|
|