sync: use progress markers instead of timestamps during GetUpdates

chrome/browser/sync/engine/syncer_proto_util.cc

 // Copyright (c) 2010 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 "chrome/browser/sync/engine/syncer_proto_util.h"
 
 #include "base/format_macros.h"
 #include "base/string_util.h"
 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
 #include "chrome/browser/sync/engine/syncer.h"
@@ skipping 149 matching lines @@
         http_response.server_status = HttpResponse::SYNC_AUTH_ERROR;
         return false;
       default:
         return true;
     }
   }
 
   return false;
 }
 
+namespace {
+
+// Helper function for an assertion in PostClientToServerMessage.
+bool IsVeryFirstGetUpdates(const ClientToServerMessage& message) {
+  if (!message.has_get_updates())
+    return false;
+  DCHECK_LT(0, message.get_updates().from_progress_marker_size());
+  for (int i = 0; i < message.get_updates().from_progress_marker_size(); ++i) {
+    if (!message.get_updates().from_progress_marker(i).token().empty())
+      return false;
+  }
+  return true;
+}
+
+}  // namespace
+
 // static
 bool SyncerProtoUtil::PostClientToServerMessage(
     const ClientToServerMessage& msg,
     ClientToServerResponse* response,
     SyncSession* session) {
 
   CHECK(response);
-  DCHECK(msg.has_store_birthday() || (msg.has_get_updates() &&
-                                      msg.get_updates().has_from_timestamp() &&
-                                      msg.get_updates().from_timestamp() == 0))
+  DCHECK(!msg.get_updates().has_from_timestamp());  // Deprecated.
+  DCHECK(!msg.get_updates().has_requested_types());  // Deprecated.
+  DCHECK(msg.has_store_birthday() || IsVeryFirstGetUpdates(msg))
       << "Must call AddRequestBirthday to set birthday.";
 
   ScopedDirLookup dir(session->context()->directory_manager(),
       session->context()->account_name());
   if (!dir.good())
     return false;
 
   if (!PostAndProcessHeaders(session->context()->connection_manager(), session,
                              msg, response))
     return false;
@@ skipping 150 matching lines @@
 std::string SyncerProtoUtil::ClientToServerResponseDebugString(
     const sync_pb::ClientToServerResponse& response) {
   // Add more handlers as needed.
   std::string output;
   if (response.has_get_updates())
     output.append(GetUpdatesResponseString(response.get_updates()));
   return output;
 }
 
 }  // namespace browser_sync