Revert 176340

sync/syncable/mutable_entry.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_SYNCABLE_MUTABLE_ENTRY_H_
 #define SYNC_SYNCABLE_MUTABLE_ENTRY_H_
 
 #include "sync/base/sync_export.h"
-#include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/base/node_ordinal.h"
 #include "sync/syncable/entry.h"
 #include "sync/syncable/metahandle_set.h"
 
 namespace syncer {
 class WriteNode;
 
 namespace syncable {
 
 class WriteTransaction;
 
 enum Create {
   CREATE
 };
 
 enum CreateNewUpdateItem {
   CREATE_NEW_UPDATE_ITEM
 };
 
 // A mutable meta entry.  Changes get committed to the database when the
 // WriteTransaction is destroyed.
 class SYNC_EXPORT_PRIVATE MutableEntry : public Entry {
-  void Init(WriteTransaction* trans, ModelType model_type,
-            const Id& parent_id, const std::string& name);
+  void Init(WriteTransaction* trans, const Id& parent_id,
+      const std::string& name);
 
  public:
-  MutableEntry(WriteTransaction* trans, Create, ModelType model_type,
-               const Id& parent_id, const std::string& name);
+  MutableEntry(WriteTransaction* trans, Create, const Id& parent_id,
+               const std::string& name);
   MutableEntry(WriteTransaction* trans, CreateNewUpdateItem, const Id& id);
   MutableEntry(WriteTransaction* trans, GetByHandle, int64);
   MutableEntry(WriteTransaction* trans, GetById, const Id&);
   MutableEntry(WriteTransaction* trans, GetByClientTag, const std::string& tag);
   MutableEntry(WriteTransaction* trans, GetByServerTag, const std::string& tag);
 
   inline WriteTransaction* write_transaction() const {
     return write_transaction_;
   }
 
@@ skipping 65 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(MutableEntry);
 };
 
 // This function sets only the flags needed to get this entry to sync.
 bool MarkForSyncing(syncable::MutableEntry* e);
 
 }  // namespace syncable
 }  // namespace syncer
 
 #endif  // SYNC_SYNCABLE_MUTABLE_ENTRY_H_