1 files changed, 3 insertions, 66 deletions
diff --git a/sync/engine/download.h b/sync/engine/download.h
index 22a3a42..0eeca97 100644
--- a/sync/engine/download.h
+++ b/sync/engine/download.h
@@ -19,80 +19,17 @@ namespace syncer {
 
 namespace sessions {
 class DebugInfoGetter;
-class NudgeTracker;
 class StatusController;
 class SyncSession;
 }  // namespace sessions
 
 namespace download {
 
-// This function executes a single GetUpdate request and stores the response in
-// the session's StatusController.  It constructs the type of request used to
-// keep types in sync when in normal mode.
-SYNC_EXPORT_PRIVATE void BuildNormalDownloadUpdates(
+// Generic initialization of a GetUpdates message.
+SYNC_EXPORT_PRIVATE void InitDownloadUpdatesContext(
     sessions::SyncSession* session,
-    GetUpdatesProcessor* get_updates_processor,
     bool create_mobile_bookmarks_folder,
-    ModelTypeSet request_types,
-    const sessions::NudgeTracker& nudge_tracker,
-    sync_pb::ClientToServerMessage* client_to_server_message);
-
-// Helper function.  Defined here for testing.
-SYNC_EXPORT_PRIVATE void BuildNormalDownloadUpdatesImpl(
-    ModelTypeSet proto_request_types,
-    GetUpdatesProcessor* get_updates_processor,
-    const sessions::NudgeTracker& nudge_tracker,
-    sync_pb::GetUpdatesMessage* get_updates);
-
-// This function executes a single GetUpdate request and stores the response in
-// the session's StatusController.  It constructs the type of request used to
-// initialize a type for the first time.
-SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForConfigure(
-    sessions::SyncSession* session,
-    GetUpdatesProcessor* get_updates_processor,
-    bool create_mobile_bookmarks_folder,
-    sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source,
-    ModelTypeSet request_types,
-    sync_pb::ClientToServerMessage* client_to_server_message);
-
-// Helper function.  Defined here for testing.
-SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForConfigureImpl(
-    ModelTypeSet proto_request_types,
-    GetUpdatesProcessor* get_updates_processor,
-    sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source,
-    sync_pb::GetUpdatesMessage* get_updates);
-
-// This function executes a single GetUpdate request and stores the response in
-// the session's status controller.  It constructs the type of request used for
-// periodic polling.
-SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForPoll(
-    sessions::SyncSession* session,
-    GetUpdatesProcessor* get_updates_processor,
-    bool create_mobile_bookmarks_folder,
-    ModelTypeSet request_types,
-    sync_pb::ClientToServerMessage* client_to_server_message);
-
-// Helper function.  Defined here for testing.
-SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForPollImpl(
-    ModelTypeSet proto_request_types,
-    GetUpdatesProcessor* get_updates_processor,
-    sync_pb::GetUpdatesMessage* get_updates);
-
-// Same as BuildDownloadUpdatesForPoll() except the update origin/source is
-// RETRY.
-SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForRetry(
-    sessions::SyncSession* session,
-    GetUpdatesProcessor* get_updates_processor,
-    bool create_mobile_bookmarks_folder,
-    ModelTypeSet request_types,
-    sync_pb::ClientToServerMessage* client_to_server_message);
-
-// Same as BuildDownloadUpdatesForPollImpl() except the update origin/source is
-// RETRY.
-SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForRetryImpl(
-    ModelTypeSet proto_request_types,
-    GetUpdatesProcessor* get_updates_processor,
-    sync_pb::GetUpdatesMessage* get_updates);
+    sync_pb::ClientToServerMessage* message);
 
 // Sends the specified message to the server and stores the response in a member
 // of the |session|'s StatusController.