[Recommit]

sync/protocol/sync.proto

 // Copyright (c) 2012 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.
 //
 // Sync protocol for communication between sync client and server.
 
 // Update proto_value_conversions{.h,.cc,_unittest.cc} if you change
 // any fields in this file.
 
 syntax = "proto2";
@@ skipping 566 matching lines @@
   // Note: this should typically only be set on the first GetUpdates a client
   // requests. Clients are expected to persist the encryption key from then on.
   // The allowed frequency for requesting encryption keys is much lower than
   // other datatypes, so repeated usage will likely result in throttling.
   optional bool need_encryption_key = 8 [default = false];
 
   // Whether to create the mobile bookmarks folder if it's not
   // already created.  Should be set to true only by mobile clients.
   optional bool create_mobile_bookmarks_folder = 1000 [default = false];
 
-  // This value is an udpated version of the GetUpdatesCallerInfo's
+  // This value is an updated version of the GetUpdatesCallerInfo's
   // GetUpdatesSource.  It describes the reason for the GetUpdate request.
   // Introduced in M29.
   optional SyncEnums.GetUpdatesOrigin get_updates_origin = 9;
+
+  // Whether this GU also serves as a retry GU. Any GU that happens after
+  // retry timer timeout is a retry GU effectively.
+  optional bool is_retry = 10 [default = false];
 };
 
 message AuthenticateMessage {
   required string auth_token = 1;
 };
 
 message ClearUserDataMessage {
 };
 
 message ClearUserDataResponse {
@@ skipping 285 matching lines @@
     // is absent then the whole client (all datatypes) is throttled.
     repeated int32 error_data_type_ids = 5;
   }
   optional Error error = 13;
 
   // The new per-client state for this client. If set, should be persisted and
   // sent with any subsequent ClientToServerMessages.
   optional ChipBag new_bag_of_chips = 14;
 };