[Sync] Move sessions/ to engine/cycle/ and rename things to match.

components/sync/engine_impl/cycle/sync_cycle_context.h

 // Copyright 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.
 
-// SyncSessionContext encapsulates the contextual information and engine
-// components specific to a SyncSession.  Unlike the SyncSession, the context
+// SyncCycleContext encapsulates the contextual information and engine
+// components specific to a SyncCycle.  Unlike the SyncCycle, the context
 // can be reused across several sync cycles.
 //
 // The context does not take ownership of its pointer members.  It's up to
 // the surrounding classes to ensure those members remain valid while the
 // context is in use.
 //
 // It can only be used from the SyncerThread.
 
-#ifndef COMPONENTS_SYNC_SESSIONS_IMPL_SYNC_SESSION_CONTEXT_H_
-#define COMPONENTS_SYNC_SESSIONS_IMPL_SYNC_SESSION_CONTEXT_H_
+#ifndef COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_SYNC_CYCLE_CONTEXT_H_
+#define COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_SYNC_CYCLE_CONTEXT_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
+#include "components/sync/engine_impl/cycle/debug_info_getter.h"
 #include "components/sync/engine_impl/model_type_registry.h"
 #include "components/sync/engine_impl/sync_engine_event_listener.h"
-#include "components/sync/sessions_impl/debug_info_getter.h"
 
 namespace syncer {
 
 class ExtensionsActivity;
 class ModelTypeRegistry;
 class ServerConnectionManager;
+class TestScopedSessionEventListener;

[skym, 2016/08/19 17:17:43]

Shouldn't need this forward declaration to friend class this thing. Also, where
is it now defined? And why did it keep 'Session' ?

[maxbogue, 2016/08/19 19:12:01]

You're right, I deleted it because it wasn't used. Good catch!

 
 namespace syncable {
 class Directory;
 }
 
 // Default number of items a client can commit in a single message.
 static const int kDefaultMaxCommitBatchSize = 25;
 
-namespace sessions {
-class TestScopedSessionEventListener;
+class SyncCycleContext {
+ public:
+  SyncCycleContext(ServerConnectionManager* connection_manager,
+                   syncable::Directory* directory,
+                   ExtensionsActivity* extensions_activity,
+                   const std::vector<SyncEngineEventListener*>& listeners,
+                   DebugInfoGetter* debug_info_getter,
+                   ModelTypeRegistry* model_type_registry,
+                   bool keystore_encryption_enabled,
+                   bool client_enabled_pre_commit_update_avoidance,
+                   const std::string& invalidator_client_id);
 
-class SyncSessionContext {
- public:
-  SyncSessionContext(ServerConnectionManager* connection_manager,
-                     syncable::Directory* directory,
-                     ExtensionsActivity* extensions_activity,
-                     const std::vector<SyncEngineEventListener*>& listeners,
-                     DebugInfoGetter* debug_info_getter,
-                     ModelTypeRegistry* model_type_registry,
-                     bool keystore_encryption_enabled,
-                     bool client_enabled_pre_commit_update_avoidance,
-                     const std::string& invalidator_client_id);
-
-  ~SyncSessionContext();
+  ~SyncCycleContext();
 
   ServerConnectionManager* connection_manager() { return connection_manager_; }
   syncable::Directory* directory() { return directory_; }
 
   ModelTypeSet GetEnabledTypes() const;
 
   void SetRoutingInfo(const ModelSafeRoutingInfo& routing_info);
 
   ExtensionsActivity* extensions_activity() {
     return extensions_activity_.get();
@@ skipping 52 matching lines @@
   }
 
   bool cookie_jar_empty() const { return cookie_jar_empty_; }
 
   void set_cookie_jar_empty(bool empty_jar) { cookie_jar_empty_ = empty_jar; }
 
  private:
   // Rather than force clients to set and null-out various context members, we
   // extend our encapsulation boundary to scoped helpers that take care of this
   // once they are allocated. See definitions of these below.
   friend class TestScopedSessionEventListener;

[skym, 2016/08/19 17:17:42]

As far as I can tell, you deleted this class. So no need to friend it anymore.

[maxbogue, 2016/08/19 19:12:01]

Right you are!

 
   base::ObserverList<SyncEngineEventListener> listeners_;
 
   ServerConnectionManager* const connection_manager_;
   syncable::Directory* const directory_;
 
   // We use this to stuff extensions activity into CommitMessages so the server
   // can correlate commit traffic with extension-related bookmark mutations.
   scoped_refptr<ExtensionsActivity> extensions_activity_;
 
@@ skipping 37 matching lines @@
   const bool client_enabled_pre_commit_update_avoidance_;
 
   // Whether the account(s) present in the content area's cookie jar match the
   // chrome account. If multiple accounts are present in the cookie jar, a
   // mismatch implies all of them are different from the chrome account.
   bool cookie_jar_mismatch_;
 
   // If there's a cookie jar mismatch, whether the cookie jar was empty or not.
   bool cookie_jar_empty_;
 
-  DISALLOW_COPY_AND_ASSIGN(SyncSessionContext);
+  DISALLOW_COPY_AND_ASSIGN(SyncCycleContext);
 };
 
-}  // namespace sessions
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_SESSIONS_IMPL_SYNC_SESSION_CONTEXT_H_
+#endif  // COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_SYNC_CYCLE_CONTEXT_H_