Revert 176340

sync/internal_api/write_node.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/internal_api/public/write_node.h"
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "sync/internal_api/public/base_transaction.h"
 #include "sync/internal_api/public/write_transaction.h"
@@ skipping 194 matching lines @@
   SetEntitySpecifics(entity_specifics);
 }
 
 void WriteNode::SetEntitySpecifics(
     const sync_pb::EntitySpecifics& new_value) {
   ModelType new_specifics_type =
       GetModelTypeFromSpecifics(new_value);
   DCHECK_NE(new_specifics_type, UNSPECIFIED);
   DVLOG(1) << "Writing entity specifics of type "
            << ModelTypeToString(new_specifics_type);
-  DCHECK_EQ(new_specifics_type, GetModelType());
+  // GetModelType() can be unspecified if this is the first time this
+  // node is being initialized (see PutModelType()).  Otherwise, it
+  // should match |new_specifics_type|.
+  if (GetModelType() != UNSPECIFIED) {
+    DCHECK_EQ(new_specifics_type, GetModelType());
+  }
 
   // Preserve unknown fields.
   const sync_pb::EntitySpecifics& old_specifics = entry_->Get(SPECIFICS);
   sync_pb::EntitySpecifics new_specifics;
   new_specifics.CopyFrom(new_value);
   new_specifics.mutable_unknown_fields()->MergeFrom(
       old_specifics.unknown_fields());
 
   // Will update the entry if encryption was necessary.
   if (!UpdateEntryWithEncryption(GetTransaction()->GetWrappedTrans(),
@@ skipping 89 matching lines @@
                                       syncable::GET_BY_SERVER_TAG, tag);
   if (!entry_->good())
     return INIT_FAILED_ENTRY_NOT_GOOD;
   if (entry_->Get(syncable::IS_DEL))
     return INIT_FAILED_ENTRY_IS_DEL;
   ModelType model_type = GetModelType();
   DCHECK_EQ(model_type, NIGORI);
   return INIT_OK;
 }
 
+void WriteNode::PutModelType(ModelType model_type) {
+  // Set an empty specifics of the appropriate datatype.  The presence
+  // of the specific field will identify the model type.
+  DCHECK(GetModelType() == model_type ||
+         GetModelType() == UNSPECIFIED);  // Immutable once set.
+
+  sync_pb::EntitySpecifics specifics;
+  AddDefaultFieldValue(model_type, &specifics);
+  SetEntitySpecifics(specifics);
+}
+
 // Create a new node with default properties, and bind this WriteNode to it.
 // Return true on success.
-bool WriteNode::InitBookmarkByCreation(const BaseNode& parent,
-                                       const BaseNode* predecessor) {
+bool WriteNode::InitByCreation(ModelType model_type,
+                               const BaseNode& parent,
+                               const BaseNode* predecessor) {
   DCHECK(!entry_) << "Init called twice";
   // |predecessor| must be a child of |parent| or NULL.
   if (predecessor && predecessor->GetParentId() != parent.GetId()) {
     DCHECK(false);
     return false;
   }
 
   syncable::Id parent_id = parent.GetEntry()->Get(syncable::ID);
 
   // Start out with a dummy name.  We expect
   // the caller to set a meaningful name after creation.
   string dummy(kDefaultNameForNewNodes);
 
   entry_ = new syncable::MutableEntry(transaction_->GetWrappedWriteTrans(),
-                                      syncable::CREATE, BOOKMARKS,
-                                      parent_id, dummy);
+                                      syncable::CREATE, parent_id, dummy);
 
   if (!entry_->good())
     return false;
 
   // Entries are untitled folders by default.
   entry_->Put(syncable::IS_DIR, true);
 
+  PutModelType(model_type);
+
   // Now set the predecessor, which sets IS_UNSYNCED as necessary.
   return PutPredecessor(predecessor);
 }
 
 // Create a new node with default properties and a client defined unique tag,
 // and bind this WriteNode to it.
 // Return true on success. If the tag exists in the database, then
 // we will attempt to undelete the node.
 // TODO(chron): Code datatype into hash tag.
 // TODO(chron): Is model type ever lost?
@@ skipping 47 matching lines @@
       // tags and updates.
 
       existing_entry->Put(syncable::NON_UNIQUE_NAME, dummy);
       existing_entry->Put(syncable::PARENT_ID, parent_id);
       entry_ = existing_entry.release();
     } else {
       return INIT_FAILED_ENTRY_ALREADY_EXISTS;
     }
   } else {
     entry_ = new syncable::MutableEntry(transaction_->GetWrappedWriteTrans(),
-                                        syncable::CREATE,
-                                        model_type, parent_id, dummy);
+                                        syncable::CREATE, parent_id, dummy);
     if (!entry_->good())
       return INIT_FAILED_COULD_NOT_CREATE_ENTRY;
 
     // Only set IS_DIR for new entries. Don't bitflip undeleted ones.
     entry_->Put(syncable::UNIQUE_CLIENT_TAG, hash);
   }
 
   // We don't support directory and tag combinations.
   entry_->Put(syncable::IS_DIR, false);
 
+  // Will clear specifics data.
+  PutModelType(model_type);
+
   // Now set the predecessor, which sets IS_UNSYNCED as necessary.
   bool success = PutPredecessor(NULL);
   if (!success)
     return INIT_FAILED_SET_PREDECESSOR;
 
   return INIT_SUCCESS;
 }
 
 bool WriteNode::SetPosition(const BaseNode& new_parent,
                             const BaseNode* predecessor) {
@@ skipping 52 matching lines @@
   MarkForSyncing();
 
   return true;
 }
 
 void WriteNode::MarkForSyncing() {
   syncable::MarkForSyncing(entry_);
 }
 
 }  // namespace syncer