Remove dependency on server generated type root folders

sync/syncable/directory_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/syncable/directory_unittest.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/test/values_test_util.h"
 #include "sync/internal_api/public/base/attachment_id_proto.h"
 #include "sync/syncable/syncable_proto_util.h"
@@ skipping 799 matching lines @@
   // grandchild    grandchild2
   ASSERT_TRUE(IsLegalNewParent(child, root));
   ASSERT_TRUE(IsLegalNewParent(child, parent));
   ASSERT_FALSE(IsLegalNewParent(child, child));
   ASSERT_FALSE(IsLegalNewParent(child, grandchild));
   ASSERT_TRUE(IsLegalNewParent(child, parent2));
   ASSERT_TRUE(IsLegalNewParent(child, grandchild2));
   ASSERT_FALSE(IsLegalNewParent(parent, grandchild));
   ASSERT_FALSE(IsLegalNewParent(root, grandchild));
   ASSERT_FALSE(IsLegalNewParent(parent, grandchild));
+  // Special case for implicit parent
+  ASSERT_TRUE(IsLegalNewParent(&wtrans, child.GetId(), syncable::Id()));
 }
 
 TEST_F(SyncableDirectoryTest, TestEntryIsInFolder) {
   // Create a subdir and an entry.
   int64 entry_handle;
   syncable::Id folder_id;
   syncable::Id entry_id;
   std::string entry_name = "entry";
 
   {
@@ skipping 207 matching lines @@
     ChangeEntryIDAndUpdateChildren(&trans, &parent, id_factory.NewServerId());
     parent.PutIsUnsynced(false);
     parent.PutBaseVersion(1);
     parent.PutServerVersion(1);
   }
 
   // Final check for validity.
   EXPECT_EQ(OPENED, SimulateSaveAndReloadDir());
 }
 
+// A test that roughly mimics the directory interaction that occurs when a
+// type root folder is created locally and then re-created (updated) from the
+// server.
+TEST_F(SyncableDirectoryTest, ChangeEntryIDAndUpdateChildren_ImplicitParent) {
+  TestIdFactory id_factory;
+  Id orig_parent_id;
+  Id child_id;
+
+  {
+    // Create two client-side items, a parent and child.
+    WriteTransaction trans(FROM_HERE, UNITTEST, dir().get());
+
+    MutableEntry parent(&trans, CREATE, PREFERENCES, id_factory.root(),
+                        "parent");
+    parent.PutIsDir(true);
+    parent.PutIsUnsynced(true);
+
+    // The child has unset parent ID. The parent is inferred from the type.
+    MutableEntry child(&trans, CREATE, PREFERENCES, "child");
+    child.PutIsUnsynced(true);
+
+    orig_parent_id = parent.GetId();
+    child_id = child.GetId();
+  }
+
+  {
+    // Simulate what happens after committing two items.  Their IDs will be
+    // replaced with server IDs.  The child is renamed first, then the parent.
+    WriteTransaction trans(FROM_HERE, UNITTEST, dir().get());
+
+    MutableEntry parent(&trans, GET_BY_ID, orig_parent_id);
+
+    ChangeEntryIDAndUpdateChildren(&trans, &parent, id_factory.NewServerId());
+    parent.PutIsUnsynced(false);
+    parent.PutBaseVersion(1);
+    parent.PutServerVersion(1);
+  }
+
+  // Final check for validity.
+  EXPECT_EQ(OPENED, SimulateSaveAndReloadDir());
+
+  // Verify that child's PARENT_ID hasn't been updated.
+  {
+    ReadTransaction trans(FROM_HERE, dir().get());
+    Entry child(&trans, GET_BY_ID, child_id);
+    EXPECT_TRUE(child.good());
+    EXPECT_TRUE(child.GetParentId().IsNull());
+  }
+}
+
 // A test based on the scenario where we create a bookmark folder and entry
 // locally, but with a twist.  In this case, the bookmark is deleted before we
 // are able to sync either it or its parent folder.  This scenario used to cause
 // directory corruption, see crbug.com/125381.
 TEST_F(SyncableDirectoryTest,
        ChangeEntryIDAndUpdateChildren_DeletedAndUnsyncedChild) {
   TestIdFactory id_factory;
   Id orig_parent_id;
   Id orig_child_id;
 
@@ skipping 769 matching lines @@
     ASSERT_EQ(1, p_root.GetTotalNodeCount() - 1);
     Entry a_root(&trans, GET_BY_ID, a_root_id);
     ASSERT_EQ(item2_id, a_root.GetFirstChildId());
     ASSERT_EQ(1, a_root.GetTotalNodeCount() - 1);
   }
 }
 
 }  // namespace syncable
 
 }  // namespace syncer