Remove dependency on server generated type root folders

sync/syncable/model_neutral_mutable_entry.cc

 // Copyright 2013 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/syncable/model_neutral_mutable_entry.h"
 
 #include <string>
 
 #include "sync/internal_api/public/base/unique_position.h"
 #include "sync/syncable/directory.h"
@@ skipping 26 matching lines @@
   // We match the database defaults here
   kernel->put(BASE_VERSION, CHANGES_VERSION);
   if (!trans->directory()->InsertEntry(trans, kernel.get())) {
     return;  // Failed inserting.
   }
   trans->TrackChangesTo(kernel.get());
 
   kernel_ = kernel.release();
 }
 
+ModelNeutralMutableEntry::ModelNeutralMutableEntry(BaseWriteTransaction* trans,
+                                                   CreateNewTypeRoot,
+                                                   ModelType type)
+    : Entry(trans), base_write_transaction_(trans) {
+  Entry same_type_root(trans, GET_TYPE_ROOT, type);
+  kernel_ = NULL;
+  if (same_type_root.good()) {
+    return;  // already have a type root for the given type
+  }
+

[Nicolas Zea, 2015/01/26 23:21:53]

CHECK that type isn't BOOKMARKS or NIGORI?

[stanisc, 2015/01/29 00:27:37]

Done.

+  scoped_ptr<EntryKernel> kernel(new EntryKernel());
+
+  sync_pb::EntitySpecifics specifics;
+  AddDefaultFieldValue(type, &specifics);
+  kernel->put(SPECIFICS, specifics);
+
+  kernel->put(ID,
+              syncable::Id::CreateFromClientString(ModelTypeToString(type)));
+  kernel->put(META_HANDLE, trans->directory()->NextMetahandle());
+  kernel->put(PARENT_ID, syncable::Id::GetRoot());
+  kernel->put(BASE_VERSION, CHANGES_VERSION);
+  kernel->put(NON_UNIQUE_NAME, ModelTypeToString(type));
+  kernel->put(IS_DIR, true);
+
+  kernel->mark_dirty(&trans->directory()->kernel_->dirty_metahandles);
+
+  if (!trans->directory()->InsertEntry(trans, kernel.get())) {
+    return;  // Failed inserting.
+  }
+
+  trans->TrackChangesTo(kernel.get());
+
+  kernel_ = kernel.release();
+}
+
 ModelNeutralMutableEntry::ModelNeutralMutableEntry(
     BaseWriteTransaction* trans, GetById, const Id& id)
     : Entry(trans, GET_BY_ID, id), base_write_transaction_(trans) {
 }
 
 ModelNeutralMutableEntry::ModelNeutralMutableEntry(
     BaseWriteTransaction* trans, GetByHandle, int64 metahandle)
     : Entry(trans, GET_BY_HANDLE, metahandle), base_write_transaction_(trans) {
 }
 
@@ skipping 327 matching lines @@
 ModelNeutralMutableEntry::ModelNeutralMutableEntry(BaseWriteTransaction* trans)
   : Entry(trans), base_write_transaction_(trans) {}
 
 MetahandleSet* ModelNeutralMutableEntry::GetDirtyIndexHelper() {
   return &dir()->kernel_->dirty_metahandles;
 }
 
 }  // namespace syncable
 
 }  // namespace syncer