Fix handling of undeletion within the syncer.

chrome/browser/sync/engine/syncer_proto_util.cc

 // Copyright (c) 2006-2008 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/auth_watcher.h"
 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
@@ skipping 101 matching lines @@
 void SyncerProtoUtil::AddRequestBirthday(syncable::Directory* dir,
                                          ClientToServerMessage* msg) {
   if (!dir->store_birthday().empty()) {
     msg->set_store_birthday(dir->store_birthday());
   }
 }
 
 // static
 bool SyncerProtoUtil::PostAndProcessHeaders(ServerConnectionManager* scm,
                                             AuthWatcher* auth_watcher,
-                                            ClientToServerMessage* msg,
+                                            const ClientToServerMessage& msg,
                                             ClientToServerResponse* response) {
 
   std::string tx, rx;
-  msg->SerializeToString(&tx);
+  msg.SerializeToString(&tx);
 
   HttpResponse http_response;
   ServerConnectionManager::PostBufferParams params = {
     tx, &rx, &http_response
   };
 
   ScopedServerStatusWatcher server_status_watcher(scm, &http_response);
   if (!scm->PostBufferWithCachedAuth(&params, &server_status_watcher)) {
     LOG(WARNING) << "Error posting from syncer:" << http_response;
     return false;
@@ skipping 21 matching lines @@
         default:
           return true;
       }
     }
 
     return false;
   }
 }
 
 // static
-bool SyncerProtoUtil::PostClientToServerMessage(ClientToServerMessage* msg,
-    ClientToServerResponse* response, SyncSession* session) {
+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))
+      << "Must call AddRequestBirthday to set birthday.";
 
   ScopedDirLookup dir(session->context()->directory_manager(),
       session->context()->account_name());
   if (!dir.good()) {
     return false;
   }
 
-  AddRequestBirthday(dir, msg);
-
   if (!PostAndProcessHeaders(session->context()->connection_manager(),
                              session->context()->auth_watcher(),
                              msg,
                              response)) {
     return false;
   }
 
   if (!VerifyResponseBirthday(dir, response)) {
     // TODO(ncarter): Add a unit test for the case where the syncer becomes
     // stuck due to a bad birthday.
@@ skipping 89 matching lines @@
 
 // static
 void SyncerProtoUtil::CopyBlobIntoProtoBytes(const syncable::Blob& blob,
                                              std::string* proto_bytes) {
   std::string blob_string(blob.begin(), blob.end());
   proto_bytes->swap(blob_string);
 }
 
 // static
 const std::string& SyncerProtoUtil::NameFromSyncEntity(
-    const SyncEntity& entry) {
+    const sync_pb::SyncEntity& entry) {
 
   if (entry.has_non_unique_name()) {
-      return entry.non_unique_name();
+    return entry.non_unique_name();
   }
 
   return entry.name();
 }
 
 // static
 const std::string& SyncerProtoUtil::NameFromCommitEntryResponse(
     const CommitResponse_EntryResponse& entry) {
 
   if (entry.has_non_unique_name()) {
@@ skipping 37 matching lines @@
     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