Commit 68fea56e authored by Alexei Svitkine's avatar Alexei Svitkine Committed by Commit Bot

Fix small issue in sync_disable_observer.cc.

IsUsingSecondaryPassphrase() shouldn't be called if sync service
isn't initialized, according to its docs.

BUG=792104

Change-Id: I6320d7cfed2dfe924ef99f2d5d87c6579347bd9a
Reviewed-on: https://chromium-review.googlesource.com/809190Reviewed-by: default avatarBryan McQuade <bmcquade@chromium.org>
Commit-Queue: Alexei Svitkine <asvitkine@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521776}
parent 61eea52a
...@@ -16,11 +16,12 @@ SyncDisableObserver::~SyncDisableObserver() {} ...@@ -16,11 +16,12 @@ SyncDisableObserver::~SyncDisableObserver() {}
// static // static
SyncDisableObserver::SyncState SyncDisableObserver::GetSyncState( SyncDisableObserver::SyncState SyncDisableObserver::GetSyncState(
syncer::SyncService* sync_service) { syncer::SyncService* sync_service) {
const bool initialized = sync_service->IsEngineInitialized();
return SyncDisableObserver::SyncState{ return SyncDisableObserver::SyncState{
sync_service->GetPreferredDataTypes().Has( sync_service->GetPreferredDataTypes().Has(
syncer::HISTORY_DELETE_DIRECTIVES), syncer::HISTORY_DELETE_DIRECTIVES),
sync_service->IsEngineInitialized(), initialized,
sync_service->IsUsingSecondaryPassphrase(), initialized ? sync_service->IsUsingSecondaryPassphrase() : false,
}; };
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment