| Index: chrome/browser/ui/webui/settings/people_handler.cc
|
| diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc
|
| index 317f7d438635070e6b5ebc5f0e164b16fb69408e..5e6f903bb9b68d9aa895fd6b5d4a09d6a2be8a75 100644
|
| --- a/chrome/browser/ui/webui/settings/people_handler.cc
|
| +++ b/chrome/browser/ui/webui/settings/people_handler.cc
|
| @@ -356,7 +356,7 @@ void PeopleHandler::SyncStartupFailed() {
|
|
|
| void PeopleHandler::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();
|
| @@ -389,7 +389,7 @@ void PeopleHandler::HandleSetDatatypes(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()) {
|
| CloseSyncSetup();
|
| ResolveJavascriptCallback(*callback_id, base::StringValue(kDonePageStatus));
|
| return;
|
| @@ -420,7 +420,7 @@ void PeopleHandler::HandleSetEncryption(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()) {
|
| CloseSyncSetup();
|
| ResolveJavascriptCallback(*callback_id, base::StringValue(kDonePageStatus));
|
| return;
|
| @@ -779,7 +779,7 @@ void PeopleHandler::PushSyncPrefs() {
|
|
|
| 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
|
| @@ -797,7 +797,7 @@ void PeopleHandler::PushSyncPrefs() {
|
| }
|
|
|
| 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:
|
|
|