[Sync] SyncEngine 1.5: Fix all backend references in PSS.

chrome/browser/sync/test/integration/sync_errors_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/passwords_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
@@ skipping 20 matching lines @@
       : SingleClientStatusChangeChecker(service) {}
 
   bool IsExitConditionSatisfied() override {
     return !service()->IsSetupInProgress() &&
            !service()->IsFirstSetupComplete();
   }
 
   std::string GetDebugMessage() const override { return "Sync Disabled"; }
 };
 
-class SyncBackendStoppedChecker : public SingleClientStatusChangeChecker {
+class SyncEngineStoppedChecker : public SingleClientStatusChangeChecker {
  public:
-  explicit SyncBackendStoppedChecker(ProfileSyncService* service)
+  explicit SyncEngineStoppedChecker(ProfileSyncService* service)
       : SingleClientStatusChangeChecker(service) {}
 
   // StatusChangeChecker implementation.
   bool IsExitConditionSatisfied() override {
-    return !service()->IsBackendInitialized();
+    return !service()->IsEngineInitialized();
   }
   std::string GetDebugMessage() const override { return "Sync stopped"; }
 };
 
 class TypeDisabledChecker : public SingleClientStatusChangeChecker {
  public:
   explicit TypeDisabledChecker(ProfileSyncService* service,
                                syncer::ModelType type)
       : SingleClientStatusChangeChecker(service), type_(type) {}
 
@@ skipping 134 matching lines @@
   SetTitle(0, node2, "new_title2");
   ASSERT_TRUE(SyncDisabledChecker(GetSyncService(0)).Wait());
   ProfileSyncService::Status status;
   GetSyncService(0)->QueryDetailedSyncStatus(&status);
   ASSERT_EQ(status.sync_protocol_error.error_type, syncer::NOT_MY_BIRTHDAY);
   ASSERT_EQ(status.sync_protocol_error.action, syncer::DISABLE_SYNC_ON_CLIENT);
   ASSERT_EQ(status.sync_protocol_error.url, url);
   ASSERT_EQ(status.sync_protocol_error.error_description, description);
 }
 
-// Tests that on receiving CLIENT_DATA_OBSOLETE sync backend gets restarted and
+// Tests that on receiving CLIENT_DATA_OBSOLETE sync engine gets restarted and
 // initialized with different cache_guld.
 IN_PROC_BROWSER_TEST_F(SyncErrorTest, ClientDataObsoleteTest) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   const BookmarkNode* node1 = AddFolder(0, 0, "title1");
   SetTitle(0, node1, "new_title1");
   ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait());
 
   std::string description = "Not My Fault";
   std::string url = "www.google.com";
 
   // Remember cache_guid before actionable error.
   ProfileSyncService::Status status;
   GetSyncService(0)->QueryDetailedSyncStatus(&status);
   std::string old_cache_guid = status.sync_id;
 
   EXPECT_TRUE(
       GetFakeServer()->TriggerError(sync_pb::SyncEnums::CLIENT_DATA_OBSOLETE));
 
   // Trigger sync by making one more change.
   const BookmarkNode* node2 = AddFolder(0, 0, "title2");
   SetTitle(0, node2, "new_title2");
 
-  ASSERT_TRUE(SyncBackendStoppedChecker(GetSyncService(0)).Wait());
+  ASSERT_TRUE(SyncEngineStoppedChecker(GetSyncService(0)).Wait());
 
   // Make server return SUCCESS so that sync can initialize.
   EXPECT_TRUE(GetFakeServer()->TriggerError(sync_pb::SyncEnums::SUCCESS));
 
-  ASSERT_TRUE(GetClient(0)->AwaitBackendInitialization());
+  ASSERT_TRUE(GetClient(0)->AwaitEngineInitialization());
 
   // Ensure cache_guid changed.
   GetSyncService(0)->QueryDetailedSyncStatus(&status);
   ASSERT_NE(old_cache_guid, status.sync_id);
 }
 
 IN_PROC_BROWSER_TEST_F(SyncErrorTest, DisableDatatypeWhileRunning) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   syncer::ModelTypeSet synced_datatypes =
       GetSyncService(0)->GetActiveDataTypes();
   ASSERT_TRUE(synced_datatypes.Has(syncer::TYPED_URLS));
   ASSERT_TRUE(synced_datatypes.Has(syncer::SESSIONS));
   GetProfile(0)->GetPrefs()->SetBoolean(
       prefs::kSavingBrowserHistoryDisabled, true);
 
   // Wait for reconfigurations.
   ASSERT_TRUE(
       TypeDisabledChecker(GetSyncService(0), syncer::TYPED_URLS).Wait());
   ASSERT_TRUE(TypeDisabledChecker(GetSyncService(0), syncer::SESSIONS).Wait());
 
   const BookmarkNode* node1 = AddFolder(0, 0, "title1");
   SetTitle(0, node1, "new_title1");
   ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait());
   // TODO(lipalani): Verify initial sync ended for typed url is false.
 }
 
 }  // namespace