[Sync] Add support for server controlled nudge delays

sync/engine/syncer_proto_util.cc

 // 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.
 
 #include "sync/engine/syncer_proto_util.h"
 
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "google_apis/google_api_keys.h"
 #include "sync/engine/net/server_connection_manager.h"
@@ skipping 402 matching lines @@
       session->delegate()->OnReceivedLongPollIntervalUpdate(
           base::TimeDelta::FromSeconds(command.set_sync_long_poll_interval()));
     }
 
     if (command.has_set_sync_poll_interval()) {
       session->delegate()->OnReceivedShortPollIntervalUpdate(
           base::TimeDelta::FromSeconds(command.set_sync_poll_interval()));
     }
 
     if (command.has_sessions_commit_delay_seconds()) {
-      session->delegate()->OnReceivedSessionsCommitDelay(
-          base::TimeDelta::FromSeconds(
-              command.sessions_commit_delay_seconds()));
+      std::map<ModelType, int> delay_map;
+      delay_map[SESSIONS] = command.sessions_commit_delay_seconds() * 1000;
+      session->delegate()->OnReceivedCustomNudgeDelays(delay_map);
     }
 
     if (command.has_client_invalidation_hint_buffer_size()) {
       session->delegate()->OnReceivedClientInvalidationHintBufferSize(
           command.client_invalidation_hint_buffer_size());
     }
 
     if (command.has_gu_retry_delay_seconds()) {
       session->delegate()->OnReceivedGuRetryDelay(
           base::TimeDelta::FromSeconds(command.gu_retry_delay_seconds()));
     }
+
+    if (command.custom_nudge_delays_size() > 0) {
+      // Note that because this happens after the sessions_commit_delay_seconds
+      // handling, any SESSIONS value in this map will override the one in
+      // sessions_commit_delay_seconds.
+      std::map<ModelType, int> delay_map;
+      for (int i = 0; i < command.custom_nudge_delays_size(); ++i) {
+        delay_map[GetModelTypeFromSpecificsFieldNumber(

[rlarocque, 2014/08/20 00:13:31]

Should we be more defensive against unknown model types here?

[Nicolas Zea, 2014/08/20 22:49:43]

Good call, this has bitten us before.

+            command.custom_nudge_delays(i).datatype_id())] =
+            command.custom_nudge_delays(i).delay_ms();
+      }
+      session->delegate()->OnReceivedCustomNudgeDelays(delay_map);
+    }
   }
 
   // Now do any special handling for the error type and decide on the return
   // value.
   switch (sync_protocol_error.error_type) {
     case UNKNOWN_ERROR:
       LOG(WARNING) << "Sync protocol out-of-date. The server is using a more "
                    << "recent version.";
       return SERVER_RETURN_UNKNOWN_ERROR;
     case SYNC_SUCCESS:
@@ skipping 128 matching lines @@
 std::string SyncerProtoUtil::ClientToServerResponseDebugString(
     const ClientToServerResponse& response) {
   // Add more handlers as needed.
   std::string output;
   if (response.has_get_updates())
     output.append(GetUpdatesResponseString(response.get_updates()));
   return output;
 }
 
 }  // namespace syncer