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

Unified Diff: components/sync/engine_impl/commit_util.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: Rebase. 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: components/sync/engine_impl/commit_util.cc
diff --git a/components/sync/engine_impl/commit_util.cc b/components/sync/engine_impl/commit_util.cc
index a2c2a4a8a971461923c592a10e360e17d9c485fb..26ac3cdd160f9410606c63a709168bbcc20c80b4 100644
--- a/components/sync/engine_impl/commit_util.cc
+++ b/components/sync/engine_impl/commit_util.cc
@@ -16,10 +16,10 @@
#include "components/sync/base/attachment_id_proto.h"
#include "components/sync/base/time.h"
#include "components/sync/base/unique_position.h"
+#include "components/sync/engine_impl/cycle/sync_cycle.h"
skym 2016/08/19 17:17:42 I don't think this import actually does anything,
maxbogue 2016/08/19 19:12:00 Removed.
#include "components/sync/engine_impl/syncer_proto_util.h"
#include "components/sync/protocol/bookmark_specifics.pb.h"
#include "components/sync/protocol/sync.pb.h"
-#include "components/sync/sessions_impl/sync_session.h"
#include "components/sync/syncable/directory.h"
#include "components/sync/syncable/entry.h"
#include "components/sync/syncable/model_neutral_mutable_entry.h"
@@ -51,7 +51,7 @@ void AddExtensionsActivityToMessage(
//
// We will push this list of extensions activity back into the
// ExtensionsActivityMonitor if this commit fails. That's why we must keep a
- // copy of these records in the session.
+ // copy of these records in the cycle.
activity->GetAndClearRecords(extensions_activity_buffer);
const ExtensionsActivity::Records& records = *extensions_activity_buffer;

Powered by Google App Engine
This is Rietveld 408576698