| Index: chrome/browser/ui/webui/options/sync_setup_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.cc b/chrome/browser/ui/webui/options/sync_setup_handler.cc
|
| index dd7f02746a759a14ff439d56a350304fb2ea059a..ed4534e1cdfb179ffb8487c0a5a52399bb6dc8d6 100644
|
| --- a/chrome/browser/ui/webui/options/sync_setup_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/sync_setup_handler.cc
|
| @@ -471,7 +471,7 @@ void SyncSetupHandler::SyncStartupFailed() {
|
|
|
| void SyncSetupHandler::SyncStartupCompleted() {
|
| ProfileSyncService* service = GetSyncService();
|
| - DCHECK(service->IsBackendInitialized());
|
| + DCHECK(service->IsEngineInitialized());
|
|
|
| // Stop a timer to handle timeout in waiting for checking network connection.
|
| backend_start_timer_.reset();
|
| @@ -515,7 +515,7 @@ void SyncSetupHandler::HandleConfigure(const base::ListValue* args) {
|
|
|
| // If the sync engine has shutdown for some reason, just close the sync
|
| // dialog.
|
| - if (!service || !service->IsBackendInitialized()) {
|
| + if (!service || !service->IsEngineInitialized()) {
|
| CloseUI();
|
| return;
|
| }
|
| @@ -821,7 +821,7 @@ void SyncSetupHandler::DisplayConfigureSync(bool passphrase_failed) {
|
| GetProfile())->IsAuthenticated());
|
| ProfileSyncService* service = GetSyncService();
|
| DCHECK(service);
|
| - if (!service->IsBackendInitialized()) {
|
| + if (!service->IsEngineInitialized()) {
|
| service->RequestStart();
|
|
|
| // See if it's even possible to bring up the sync backend - if not
|
| @@ -843,7 +843,7 @@ void SyncSetupHandler::DisplayConfigureSync(bool passphrase_failed) {
|
| // longer need a SyncStartupTracker.
|
| sync_startup_tracker_.reset();
|
| configuring_sync_ = true;
|
| - DCHECK(service->IsBackendInitialized())
|
| + DCHECK(service->IsEngineInitialized())
|
| << "Cannot configure sync until the sync backend is initialized";
|
|
|
| // Setup args for the sync configure screen:
|
|
|