Sync: support implicit permanent folders in commits.

sync/engine/directory_commit_contribution_unittest.cc

 // Copyright 2014 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/engine/directory_commit_contribution.h"
 
 #include "base/message_loop/message_loop.h"
 #include "sync/internal_api/public/base/attachment_id_proto.h"
 #include "sync/sessions/status_controller.h"
 #include "sync/syncable/entry.h"
@@ skipping 20 matching lines @@
   }
 
   void TearDown() override { dir_maker_.TearDown(); }
 
  protected:
   int64 CreateUnsyncedItemWithAttachments(
       syncable::WriteTransaction* trans,
       ModelType type,
       const std::string& tag,
       const sync_pb::AttachmentMetadata& attachment_metadata) {
-    syncable::Entry parent_entry(trans, syncable::GET_TYPE_ROOT, type);
-    syncable::MutableEntry entry(
-        trans,
-        syncable::CREATE,
-        type,
-        parent_entry.GetId(),
-        tag);
+    // For bookmarks specify the Bookmarks root folder as the parent;
+    // for other types leave the parent ID empty
+    syncable::Id parent_id;
+    if (type == BOOKMARKS) {
+      syncable::Entry parent_entry(trans, syncable::GET_TYPE_ROOT, type);
+      parent_id = parent_entry.GetId();
+    }
+
+    syncable::MutableEntry entry(trans, syncable::CREATE, type, parent_id, tag);
     if (attachment_metadata.record_size() > 0) {
       entry.PutAttachmentMetadata(attachment_metadata);
     }
     entry.PutIsUnsynced(true);
     return entry.GetMetahandle();
   }
 
   int64 CreateUnsyncedItem(syncable::WriteTransaction* trans,
                            ModelType type,
                            const std::string& tag) {
@@ skipping 435 matching lines @@
     syncable::Entry a3(&trans, syncable::GET_BY_HANDLE, art3_handle);
     EXPECT_FALSE(a3.GetId().ServerKnows());
     EXPECT_FALSE(a3.GetSyncing());
     EXPECT_EQ(0, a3.GetServerVersion());
   }
 
   art_cc->CleanUp();
 }
 
 }  // namespace syncer