Client-side changes to support retry GU.

sync/engine/download_unittest.cc

 // 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.
 
 #include "sync/engine/download.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "sync/engine/sync_directory_update_handler.h"
 #include "sync/internal_api/public/base/model_type_test_util.h"
@@ skipping 201 matching lines @@
 
   ModelTypeSet progress_types;
   for (int i = 0; i < gu_msg.from_progress_marker_size(); ++i) {
     syncer::ModelType type = GetModelTypeFromSpecificsFieldNumber(
         gu_msg.from_progress_marker(i).data_type_id());
     progress_types.Put(type);
   }
   EXPECT_TRUE(proto_request_types().Equals(progress_types));
 }
 
+TEST_F(DownloadUpdatesTest, RetryTest) {
+  sync_pb::ClientToServerMessage msg;
+  download::BuildDownloadUpdatesForRetryImpl(
+      proto_request_types(),
+      update_handler_map(),
+      msg.mutable_get_updates());
+
+  const sync_pb::GetUpdatesMessage& gu_msg = msg.get_updates();
+
+  EXPECT_EQ(sync_pb::SyncEnums::RETRY, gu_msg.get_updates_origin());
+  EXPECT_EQ(sync_pb::GetUpdatesCallerInfo::RETRY,
+            gu_msg.caller_info().source());
+  EXPECT_TRUE(gu_msg.is_retry());
+
+  ModelTypeSet progress_types;
+  for (int i = 0; i < gu_msg.from_progress_marker_size(); ++i) {
+    syncer::ModelType type = GetModelTypeFromSpecificsFieldNumber(
+        gu_msg.from_progress_marker(i).data_type_id());
+    progress_types.Put(type);
+  }
+  EXPECT_TRUE(proto_request_types().Equals(progress_types));
+}
+
+TEST_F(DownloadUpdatesTest, NudgeWithRetryTest) {
+  sessions::NudgeTracker nudge_tracker;
+  nudge_tracker.RecordLocalChange(ModelTypeSet(BOOKMARKS));
+  nudge_tracker.set_next_retry_time(
+      base::TimeTicks::Now() - base::TimeDelta::FromSeconds(1));
+
+  sync_pb::ClientToServerMessage msg;
+  download::BuildNormalDownloadUpdatesImpl(proto_request_types(),
+                                           update_handler_map(),
+                                           nudge_tracker,
+                                           msg.mutable_get_updates());
+  EXPECT_TRUE(msg.get_updates().is_retry());
+}
+
 // Verify that a bogus response message is detected.
 TEST_F(DownloadUpdatesTest, InvalidResponse) {
   sync_pb::GetUpdatesResponse gu_response;
   InitFakeUpdateResponse(&gu_response);
 
   // This field is essential for making the client stop looping.  If it's unset
   // then something is very wrong.  The client should detect this.
   gu_response.clear_changes_remaining();
 
   sessions::StatusController status;
@@ skipping 65 matching lines @@
 TEST_F(DownloadUpdatesDebugInfoTest, VerifyCopyOverwrites) {
   sync_pb::DebugInfo debug_info;
   AddDebugEvent();
   download::CopyClientDebugInfo(debug_info_getter(), &debug_info);
   EXPECT_EQ(1, debug_info.events_size());
   download::CopyClientDebugInfo(debug_info_getter(), &debug_info);
   EXPECT_EQ(1, debug_info.events_size());
 }
 
 }  // namespace syncer