Client-side changes to support retry GU.

sync/engine/download.h

 // Copyright 2013 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.
 
 #ifndef SYNC_ENGINE_DOWNLOAD_H_
 #define SYNC_ENGINE_DOWNLOAD_H_
 
 #include "sync/base/sync_export.h"
 #include "sync/engine/sync_directory_update_handler.h"
 #include "sync/internal_api/public/base/model_type.h"
@@ skipping 57 matching lines @@
     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,
     UpdateHandlerMap* update_handler_map,
     sync_pb::GetUpdatesMessage* get_updates);
 
+// Same as above except the update origin is RETRY.
+SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForRetry(
+    sessions::SyncSession* session,
+    bool create_mobile_bookmarks_folder,
+    ModelTypeSet request_types,
+    sync_pb::ClientToServerMessage* client_to_server_message);
+SYNC_EXPORT_PRIVATE void BuildDownloadUpdatesForRetryImpl(

[rlarocque, 2014/01/08 20:30:08]

The reason we have separate Impl methods is to allow us to test the building of
request messages.  You should probably add a test to download_unittest.cc as you
add this function, and maybe update a few of the existing tests too.  (eg. Test
that the is_retry flag is set properly.)

Also, nit: please separate these two functions with a newline and add a comment
to the second one.

[haitaol1, 2014/01/10 00:15:58]

Done.

+    ModelTypeSet proto_request_types,
+    UpdateHandlerMap* update_handler_map,
+    sync_pb::GetUpdatesMessage* get_updates);
+
 // Sends the specified message to the server and stores the response in a member
 // of the |session|'s StatusController.
 SYNC_EXPORT_PRIVATE SyncerError
     ExecuteDownloadUpdates(ModelTypeSet request_types,
                            sessions::SyncSession* session,
                            sync_pb::ClientToServerMessage* msg);
 
 // Helper function for processing responses from the server.
 // Defined here for testing.
 SYNC_EXPORT_PRIVATE SyncerError ProcessResponse(
     const sync_pb::GetUpdatesResponse& gu_response,
     ModelTypeSet proto_request_types,
     UpdateHandlerMap* handler_map,
     sessions::StatusController* status);
 
 // Helper function to copy client debug info from debug_info_getter to
 // debug_info.  Defined here for testing.
 SYNC_EXPORT_PRIVATE void CopyClientDebugInfo(
     sessions::DebugInfoGetter* debug_info_getter,
     sync_pb::DebugInfo* debug_info);
 
 }  // namespace download
 
 }  // namespace syncer
 
 #endif  // SYNC_ENGINE_DOWNLOAD_H_