Experimental functionize patch

sync/sessions/test_util.h

Index: sync/sessions/test_util.h
diff --git a/sync/sessions/test_util.h b/sync/sessions/test_util.h
index 6ab32b194c423c5cf3483a18b70dcd0bc2f3e523..c66997bdc278109856040aabba4cf44d327d9476 100644
--- a/sync/sessions/test_util.h
+++ b/sync/sessions/test_util.h
@@ -15,25 +15,55 @@ namespace syncer {
 namespace sessions {
 namespace test_util {
 
+// Configure sync cycle successes and failures.
 void SimulateGetEncryptionKeyFailed(sessions::SyncSession* session,
-                                    SyncerStep begin, SyncerStep end);
+                                    ModelTypeSet requested_types);
+void SimulateConfigureSuccess(sessions::SyncSession* session,
+                              ModelTypeSet requested_types);
+void SimulateConfigureFailed(sessions::SyncSession* session,
+                             ModelTypeSet requested_types);
+void SimulateConfigureConnectionFailure(sessions::SyncSession* session,
+                                        ModelTypeSet requested_types);
+
+// Normal mode sync cycle successes and failures.
+void SimulateNormalSuccess(sessions::SyncSession* session,
+                           ModelTypeSet requested_types,
+                           const sessions::NudgeTracker& nudge_tracker);
 void SimulateDownloadUpdatesFailed(sessions::SyncSession* session,
-                                   SyncerStep begin, SyncerStep end);
+                                   ModelTypeSet requested_types,
+                                   const sessions::NudgeTracker& nudge_tracker);
 void SimulateCommitFailed(sessions::SyncSession* session,
-                          SyncerStep begin, SyncerStep end);
+                          ModelTypeSet requested_types,
+                          const sessions::NudgeTracker& nudge_tracker);
 void SimulateConnectionFailure(sessions::SyncSession* session,
-                          SyncerStep begin, SyncerStep end);
-void SimulateSuccess(sessions::SyncSession* session,
-                     SyncerStep begin, SyncerStep end);
+                               ModelTypeSet requested_types,
+                               const sessions::NudgeTracker& nudge_tracker);
+
+// Poll successes and failures.
+void SimulatePollSuccess(sessions::SyncSession* session,
+                         ModelTypeSet requested_types);
+void SimulatePollFailed(sessions::SyncSession* session,
+                        ModelTypeSet requested_types);
+
 void SimulateThrottledImpl(sessions::SyncSession* session,
     const base::TimeDelta& delta);
+
 void SimulateTypesThrottledImpl(
     sessions::SyncSession* session,
     ModelTypeSet types,
     const base::TimeDelta& delta);
-void SimulatePollIntervalUpdateImpl(sessions::SyncSession* session,
+
+// Works with poll cycles.
+void SimulatePollIntervalUpdateImpl(
+    sessions::SyncSession* session,
+    ModelTypeSet requested_types,
     const base::TimeDelta& new_poll);
-void SimulateSessionsCommitDelayUpdateImpl(sessions::SyncSession* session,
+
+// Works with normal cycles.
+void SimulateSessionsCommitDelayUpdateImpl(
+    sessions::SyncSession* session,
+    ModelTypeSet requested_types,
+    const sessions::NudgeTracker& nudge_tracker,
     const base::TimeDelta& new_delay);
 
 ACTION_P(SimulateThrottled, throttle) {
@@ -45,11 +75,11 @@ ACTION_P2(SimulateTypesThrottled, types, throttle) {
 }
 
 ACTION_P(SimulatePollIntervalUpdate, poll) {
-  SimulatePollIntervalUpdateImpl(arg0, poll);
+  SimulatePollIntervalUpdateImpl(arg0, arg1, poll);
 }
 
 ACTION_P(SimulateSessionsCommitDelayUpdate, poll) {
-  SimulateSessionsCommitDelayUpdateImpl(arg0, poll);
+  SimulateSessionsCommitDelayUpdateImpl(arg0, arg1, arg2, poll);
 }
 
 }  // namespace test_util