Fix handling of undeletion within the syncer.

chrome/browser/sync/engine/syncproto.h

 // Copyright (c) 2009 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.
 //
 // Wrappers to help us work with ids and protobuffers.
 
 #ifndef CHROME_BROWSER_SYNC_ENGINE_SYNCPROTO_H_
 #define CHROME_BROWSER_SYNC_ENGINE_SYNCPROTO_H_
 
 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
 #include "chrome/browser/sync/protocol/password_specifics.pb.h"
 #include "chrome/browser/sync/protocol/preference_specifics.pb.h"
 #include "chrome/browser/sync/protocol/sync.pb.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/syncable/syncable_id.h"
 
 namespace browser_sync {
 
 template<class Base>
 class IdWrapper : public Base {
  public:
+  IdWrapper() {}
+  explicit IdWrapper(const Base& other) : Base(other) {
+  }
   syncable::Id id() const {
     return syncable::Id::CreateFromServerId(Base::id_string());
   }
   void set_id(const syncable::Id& id) {
     Base::set_id_string(id.GetServerId());
   }
 };
 
 // These wrapper classes contain no data, so their super classes can be cast to
 // them directly.
 class SyncEntity : public IdWrapper<sync_pb::SyncEntity> {
  public:
+  SyncEntity() {}
+  explicit SyncEntity(const sync_pb::SyncEntity& other)
+      : IdWrapper<sync_pb::SyncEntity>(other) {
+  }
+
   void set_parent_id(const syncable::Id& id) {
     set_parent_id_string(id.GetServerId());
   }
   syncable::Id parent_id() const {
     return syncable::Id::CreateFromServerId(parent_id_string());
   }
   void set_old_parent_id(const syncable::Id& id) {
     IdWrapper<sync_pb::SyncEntity>::set_old_parent_id(
       id.GetServerId());
   }
@@ skipping 28 matching lines @@
 
 typedef sync_pb::CommitMessage CommitMessage;
 typedef sync_pb::ClientToServerResponse ClientToServerResponse;
 typedef sync_pb::CommitResponse CommitResponse;
 typedef sync_pb::GetUpdatesResponse GetUpdatesResponse;
 typedef sync_pb::GetUpdatesMessage GetUpdatesMessage;
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_ENGINE_SYNCPROTO_H_