Revert 176340

sync/internal_api/public/write_node.h

 // Copyright 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.
 
 #ifndef SYNC_INTERNAL_API_PUBLIC_WRITE_NODE_H_
 #define SYNC_INTERNAL_API_PUBLIC_WRITE_NODE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 49 matching lines @@
 
   // A client must use one (and only one) of the following Init variants to
   // populate the node.
 
   // BaseNode implementation.
   virtual InitByLookupResult InitByIdLookup(int64 id) OVERRIDE;
   virtual InitByLookupResult InitByClientTagLookup(
       ModelType model_type,
       const std::string& tag) OVERRIDE;
 
-  // Create a new bookmark node with the specified parent and predecessor.  Use
-  // a NULL |predecessor| to indicate that this is to be the first child.
+  // Create a new node with the specified parent and predecessor.  |model_type|
+  // dictates the type of the item, and controls which EntitySpecifics proto
+  // extension can be used with this item.  Use a NULL |predecessor|
+  // to indicate that this is to be the first child.
   // |predecessor| must be a child of |new_parent| or NULL. Returns false on
   // failure.
-  bool InitBookmarkByCreation(const BaseNode& parent,
-                              const BaseNode* predecessor);
+  bool InitByCreation(ModelType model_type,
+                      const BaseNode& parent,
+                      const BaseNode* predecessor);
 
   // Create nodes using this function if they're unique items that
   // you want to fetch using client_tag. Note that the behavior of these
   // items is slightly different than that of normal items.
   // Most importantly, if it exists locally, this function will
   // actually undelete it
   // Client unique tagged nodes must NOT be folders.
   InitUniqueByCreationResult InitUniqueByCreation(
       ModelType model_type,
       const BaseNode& parent,
@@ skipping 87 matching lines @@
 
   virtual const BaseTransaction* GetTransaction() const OVERRIDE;
 
   syncable::MutableEntry* GetMutableEntryForTest();
 
  private:
   FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, EncryptBookmarksWithLegacyData);
 
   void* operator new(size_t size);  // Node is meant for stack use only.
 
+  // Helper to set model type. This will clear any specifics data.
+  void PutModelType(ModelType model_type);
+
   // Helper to set the previous node.
   bool PutPredecessor(const BaseNode* predecessor) WARN_UNUSED_RESULT;
 
   // Sets IS_UNSYNCED and SYNCING to ensure this entry is considered in an
   // upcoming commit pass.
   void MarkForSyncing();
 
   // The underlying syncable object which this class wraps.
   syncable::MutableEntry* entry_;
 
   // The sync API transaction that is the parent of this node.
   WriteTransaction* transaction_;
 
   DISALLOW_COPY_AND_ASSIGN(WriteNode);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_PUBLIC_WRITE_NODE_H_