| Index: chrome/browser/dom_ui/options/sync_options_handler.cc
|
| diff --git a/chrome/browser/dom_ui/options/sync_options_handler.cc b/chrome/browser/dom_ui/options/sync_options_handler.cc
|
| index e67050c4fb9afb39742081fdb0aea50a3d9483d9..da9b08032d61b6ae5a9808ebfef5e4c5b345ee9f 100644
|
| --- a/chrome/browser/dom_ui/options/sync_options_handler.cc
|
| +++ b/chrome/browser/dom_ui/options/sync_options_handler.cc
|
| @@ -59,10 +59,9 @@ void SyncOptionsHandler::GetLocalizedValues(
|
|
|
| void SyncOptionsHandler::Initialize() {
|
| ProfileSyncService* service =
|
| - dom_ui_->GetProfile()->GetOriginalProfile()->GetProfileSyncService();
|
| - // If service is unavailable for some good reason, 'IsEnabled()' method
|
| - // should return false. Otherwise something is broken.
|
| - DCHECK(service);
|
| + dom_ui_->GetProfile()->GetProfileSyncService();
|
| + if (!service)
|
| + return; // Can happen in ChromeOS if called before login.
|
|
|
| DictionaryValue args;
|
| SyncSetupFlow::GetArgsForConfigure(service, &args);
|
|
|