| Index: chrome/browser/sync/test/integration/profile_sync_service_harness.cc
|
| diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
|
| index f2f2b643b6bd98ab26694b9897f6fc16650abcc1..04c6fdc0be0ab3cae982235e8f15b379b8600e0e 100644
|
| --- a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
|
| +++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
|
| @@ -33,7 +33,7 @@
|
| #include "components/sync/engine/sync_string_conversions.h"
|
| #include "google_apis/gaia/gaia_constants.h"
|
|
|
| -using syncer::sessions::SyncSessionSnapshot;
|
| +using syncer::SyncCycleSnapshot;
|
|
|
| namespace {
|
|
|
| @@ -317,12 +317,12 @@ void ProfileSyncServiceHarness::FinishSyncSetup() {
|
| service()->SetFirstSetupComplete();
|
| }
|
|
|
| -SyncSessionSnapshot ProfileSyncServiceHarness::GetLastSessionSnapshot() const {
|
| +SyncCycleSnapshot ProfileSyncServiceHarness::GetLastCycleSnapshot() const {
|
| DCHECK(service() != NULL) << "Sync service has not yet been set up.";
|
| if (service()->IsSyncActive()) {
|
| - return service()->GetLastSessionSnapshot();
|
| + return service()->GetLastCycleSnapshot();
|
| }
|
| - return SyncSessionSnapshot();
|
| + return SyncCycleSnapshot();
|
| }
|
|
|
| bool ProfileSyncServiceHarness::EnableSyncForDatatype(
|
| @@ -438,7 +438,7 @@ std::string ProfileSyncServiceHarness::GetClientInfoString(
|
| std::stringstream os;
|
| os << profile_debug_name_ << ": " << message << ": ";
|
| if (service()) {
|
| - const SyncSessionSnapshot& snap = GetLastSessionSnapshot();
|
| + const SyncCycleSnapshot& snap = GetLastCycleSnapshot();
|
| ProfileSyncService::Status status;
|
| service()->QueryDetailedSyncStatus(&status);
|
| // Capture select info from the sync session snapshot and syncer status.
|
|
|