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

components/sync/engine_impl/cycle/test_util.h

Index: components/sync/engine_impl/cycle/test_util.h
diff --git a/components/sync/sessions_impl/test_util.h b/components/sync/engine_impl/cycle/test_util.h
similarity index 54%
rename from components/sync/sessions_impl/test_util.h
rename to components/sync/engine_impl/cycle/test_util.h
index dc1028b51b67baa03d85156613ca8e1013c9318b..4a558d3d0c361a6ad94e2f77792cf47283a14cb7 100644
--- a/components/sync/sessions_impl/test_util.h
+++ b/components/sync/engine_impl/cycle/test_util.h
@@ -2,78 +2,72 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Utils to simulate various outcomes of a sync session.
-#ifndef COMPONENTS_SYNC_SESSIONS_IMPL_TEST_UTIL_H_
-#define COMPONENTS_SYNC_SESSIONS_IMPL_TEST_UTIL_H_
+// Utils to simulate various outcomes of a sync cycle.
+#ifndef COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_TEST_UTIL_H_
+#define COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_TEST_UTIL_H_
 
+#include "components/sync/engine_impl/cycle/sync_cycle.h"
 #include "components/sync/engine_impl/syncer.h"
-#include "components/sync/sessions_impl/sync_session.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
-namespace sessions {
 namespace test_util {
 
 // Configure sync cycle successes and failures.
 void SimulateGetEncryptionKeyFailed(
     ModelTypeSet requested_types,
     sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source,
-    sessions::SyncSession* session);
+    SyncCycle* cycle);
 void SimulateConfigureSuccess(
     ModelTypeSet requested_types,
     sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source,
-    sessions::SyncSession* session);
+    SyncCycle* cycle);
 void SimulateConfigureFailed(
     ModelTypeSet requested_types,
     sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source,
-    sessions::SyncSession* session);
+    SyncCycle* cycle);
 void SimulateConfigureConnectionFailure(
     ModelTypeSet requested_types,
     sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source,
-    sessions::SyncSession* session);
+    SyncCycle* cycle);
 
 // Normal mode sync cycle successes and failures.
 void SimulateNormalSuccess(ModelTypeSet requested_types,
-                           sessions::NudgeTracker* nudge_tracker,
-                           sessions::SyncSession* session);
+                           NudgeTracker* nudge_tracker,
+                           SyncCycle* cycle);
 void SimulateDownloadUpdatesFailed(ModelTypeSet requested_types,
-                                   sessions::NudgeTracker* nudge_tracker,
-                                   sessions::SyncSession* session);
+                                   NudgeTracker* nudge_tracker,
+                                   SyncCycle* cycle);
 void SimulateCommitFailed(ModelTypeSet requested_types,
-                          sessions::NudgeTracker* nudge_tracker,
-                          sessions::SyncSession* session);
+                          NudgeTracker* nudge_tracker,
+                          SyncCycle* cycle);
 void SimulateConnectionFailure(ModelTypeSet requested_types,
-                               sessions::NudgeTracker* nudge_tracker,
-                               sessions::SyncSession* session);
+                               NudgeTracker* nudge_tracker,
+                               SyncCycle* cycle);
 
 // Poll successes and failures.
-void SimulatePollSuccess(ModelTypeSet requested_types,
-                         sessions::SyncSession* session);
-void SimulatePollFailed(ModelTypeSet requested_types,
-                        sessions::SyncSession* session);
+void SimulatePollSuccess(ModelTypeSet requested_types, SyncCycle* cycle);
+void SimulatePollFailed(ModelTypeSet requested_types, SyncCycle* cycle);
 
-void SimulateGuRetryDelayCommandImpl(sessions::SyncSession* session,
-                                     base::TimeDelta delay);
+void SimulateGuRetryDelayCommandImpl(SyncCycle* cycle, base::TimeDelta delay);
 
-void SimulateThrottledImpl(sessions::SyncSession* session,
-                           const base::TimeDelta& delta);
+void SimulateThrottledImpl(SyncCycle* cycle, const base::TimeDelta& delta);
 
-void SimulateTypesThrottledImpl(sessions::SyncSession* session,
+void SimulateTypesThrottledImpl(SyncCycle* cycle,
                                 ModelTypeSet types,
                                 const base::TimeDelta& delta);
 
 // Works with poll cycles.
 void SimulatePollIntervalUpdateImpl(ModelTypeSet requested_types,
-                                    sessions::SyncSession* session,
+                                    SyncCycle* cycle,
                                     const base::TimeDelta& new_poll);
 
 // Works with normal cycles.
-void SimulateSessionsCommitDelayUpdateImpl(
-    ModelTypeSet requested_types,
-    sessions::NudgeTracker* nudge_tracker,
-    sessions::SyncSession* session,
-    const base::TimeDelta& new_delay);
+void SimulateSessionsCommitDelayUpdateImpl(ModelTypeSet requested_types,
+                                           NudgeTracker* nudge_tracker,
+                                           SyncCycle* cycle,
+                                           const base::TimeDelta& new_delay);
 
 ACTION_P(SimulateThrottled, throttle) {
   SimulateThrottledImpl(arg0, throttle);
@@ -96,7 +90,6 @@ ACTION_P(SimulateGuRetryDelayCommand, delay) {
 }
 
 }  // namespace test_util
-}  // namespace sessions
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_SESSIONS_IMPL_TEST_UTIL_H_
+#endif  // COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_TEST_UTIL_H_