Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4519)

Unified Diff: chrome/browser/sync/test/integration/profile_sync_service_harness.cc

Issue 2258873003: [Sync] Move sessions/ to engine/cycle/ and rename things to match. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.

Powered by Google App Engine
This is Rietveld 408576698