Experimental functionize patch

sync/sessions/test_util.cc

Index: sync/sessions/test_util.cc
diff --git a/sync/sessions/test_util.cc b/sync/sessions/test_util.cc
index 24caa7bde0ec7523534b19b20bfeab8505b7e3be..343fc9b468ea3e0edd5fea9331292b15f71a003b 100644
--- a/sync/sessions/test_util.cc
+++ b/sync/sessions/test_util.cc
@@ -9,22 +9,55 @@ namespace sessions {
 namespace test_util {
 
 void SimulateGetEncryptionKeyFailed(sessions::SyncSession* session,
-                                    SyncerStep begin, SyncerStep end) {
+                                    ModelTypeSet requsted_types) {
   session->mutable_status_controller()->set_last_get_key_result(
       SERVER_RESPONSE_VALIDATION_FAILED);
   session->mutable_status_controller()->set_last_download_updates_result(
       SYNCER_OK);
 }
 
-void SimulateDownloadUpdatesFailed(sessions::SyncSession* session,
-                                   SyncerStep begin, SyncerStep end) {
+void SimulateConfigureSuccess(sessions::SyncSession* session,
+                              ModelTypeSet requsted_types) {
+  ASSERT_EQ(0U, session->status_controller().num_server_changes_remaining());
+  session->mutable_status_controller()->set_last_get_key_result(SYNCER_OK);
+  session->mutable_status_controller()->set_last_download_updates_result(
+      SYNCER_OK);
+}
+
+void SimulateConfigureFailed(sessions::SyncSession* session,
+                             ModelTypeSet requsted_types) {
   session->mutable_status_controller()->set_last_get_key_result(SYNCER_OK);
   session->mutable_status_controller()->set_last_download_updates_result(
       SERVER_RETURN_TRANSIENT_ERROR);
 }
 
+void SimulateConfigureConnectionFailure(sessions::SyncSession* session,
+                                        ModelTypeSet requsted_types) {
+  session->mutable_status_controller()->set_last_get_key_result(SYNCER_OK);
+  session->mutable_status_controller()->set_last_download_updates_result(
+      NETWORK_CONNECTION_UNAVAILABLE);
+}
+
+void SimulateNormalSuccess(sessions::SyncSession* session,
+                           ModelTypeSet requested_types,
+                           const sessions::NudgeTracker& nudge_tracker) {
+  ASSERT_EQ(0U, session->status_controller().num_server_changes_remaining());
+  session->mutable_status_controller()->set_commit_result(SYNCER_OK);
+  session->mutable_status_controller()->set_last_download_updates_result(
+      SYNCER_OK);
+}
+
+void SimulateDownloadUpdatesFailed(
+    sessions::SyncSession* session,
+    ModelTypeSet requested_types,
+    const sessions::NudgeTracker& nudge_tracker) {
+  session->mutable_status_controller()->set_last_download_updates_result(
+      SERVER_RETURN_TRANSIENT_ERROR);
+}
+
 void SimulateCommitFailed(sessions::SyncSession* session,
-                          SyncerStep begin, SyncerStep end) {
+                          ModelTypeSet requested_types,
+                          const sessions::NudgeTracker& nudge_tracker) {
   session->mutable_status_controller()->set_last_get_key_result(SYNCER_OK);
   session->mutable_status_controller()->set_last_download_updates_result(
       SYNCER_OK);
@@ -33,33 +66,24 @@ void SimulateCommitFailed(sessions::SyncSession* session,
 }
 
 void SimulateConnectionFailure(sessions::SyncSession* session,
-                               SyncerStep begin, SyncerStep end) {
+                           ModelTypeSet requested_types,
+                           const sessions::NudgeTracker& nudge_tracker) {
   session->mutable_status_controller()->set_last_download_updates_result(
       NETWORK_CONNECTION_UNAVAILABLE);
 }
 
-void SimulateSuccess(sessions::SyncSession* session,
-                     SyncerStep begin, SyncerStep end) {
-  const sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source =
-      session->source().updates_source;
+void SimulatePollSuccess(sessions::SyncSession* session,
+                         ModelTypeSet requested_types) {
   ASSERT_EQ(0U, session->status_controller().num_server_changes_remaining());
-  switch(end) {
-    case SYNCER_END:
-      session->mutable_status_controller()->set_commit_result(SYNCER_OK);
-      session->mutable_status_controller()->set_last_get_key_result(SYNCER_OK);
-      session->mutable_status_controller()->set_last_download_updates_result(
-          SYNCER_OK);
-      break;
-    case APPLY_UPDATES:
-      DCHECK(source == sync_pb::GetUpdatesCallerInfo::RECONFIGURATION
-             || source == sync_pb::GetUpdatesCallerInfo::PERIODIC);
-      session->mutable_status_controller()->set_last_get_key_result(SYNCER_OK);
-      session->mutable_status_controller()->set_last_download_updates_result(
-          SYNCER_OK);
-      break;
-    default:
-      ADD_FAILURE() << "Not a valid END state.";
-  }
+  session->mutable_status_controller()->set_last_download_updates_result(
+      SYNCER_OK);
+}
+
+void SimulatePollFailed(sessions::SyncSession* session,
+                        ModelTypeSet requested_types) {
+  ASSERT_EQ(0U, session->status_controller().num_server_changes_remaining());
+  session->mutable_status_controller()->set_last_download_updates_result(
+      SERVER_RETURN_TRANSIENT_ERROR);
 }
 
 void SimulateThrottledImpl(sessions::SyncSession* session,
@@ -78,15 +102,20 @@ void SimulateTypesThrottledImpl(
   session->delegate()->OnTypesThrottled(types, delta);
 }
 
-void SimulatePollIntervalUpdateImpl(sessions::SyncSession* session,
+void SimulatePollIntervalUpdateImpl(
+    sessions::SyncSession* session,
+    ModelTypeSet requested_types,
     const base::TimeDelta& new_poll) {
-  SimulateSuccess(session, SYNCER_BEGIN, SYNCER_END);
+  SimulatePollSuccess(session, requested_types);
   session->delegate()->OnReceivedLongPollIntervalUpdate(new_poll);
 }
 
-void SimulateSessionsCommitDelayUpdateImpl(sessions::SyncSession* session,
+void SimulateSessionsCommitDelayUpdateImpl(
+    sessions::SyncSession* session,
+    ModelTypeSet requested_types,
+    const sessions::NudgeTracker& nudge_tracker,
     const base::TimeDelta& new_delay) {
-  SimulateSuccess(session, SYNCER_BEGIN, SYNCER_END);
+  SimulateNormalSuccess(session, requested_types, nudge_tracker);
   session->delegate()->OnReceivedSessionsCommitDelay(new_delay);
 }