Remove dependency on server generated type root folders

sync/engine/directory_update_handler_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_update_handler.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "sync/engine/syncer_proto_util.h"
@@ skipping 66 matching lines @@
     return ui_worker_;
   }
 
   bool EntryExists(const std::string& id) {
     syncable::ReadTransaction trans(FROM_HERE, dir());
     syncable::Entry e(&trans, syncable::GET_BY_ID,
                       Id::CreateFromServerId(id));
     return e.good() && !e.GetIsDel();
   }
 
+  bool TypeRootExists(ModelType model_type) {
+    syncable::ReadTransaction trans(FROM_HERE, dir());
+    syncable::Entry e(&trans, syncable::GET_TYPE_ROOT, model_type);
+    return e.good() && !e.GetIsDel();
+  }
+
  protected:
   // Used in the construction of DirectoryTypeDebugInfoEmitters.
   ObserverList<TypeDebugInfoObserver> type_observers_;
 
  private:
   base::MessageLoop loop_;  // Needed to initialize the directory.
   TestDirectorySetterUpper dir_maker_;
   scoped_refptr<FakeModelWorker> ui_worker_;
 };
 
@@ skipping 163 matching lines @@
       GetSpecificsFieldNumberFromModelType(SYNCED_NOTIFICATIONS));
   progress.set_token("token");
   progress.mutable_gc_directive()->set_version_watermark(kDefaultVersion + 10);
 
   sync_pb::DataTypeContext context;
   context.set_data_type_id(
       GetSpecificsFieldNumberFromModelType(SYNCED_NOTIFICATIONS));
   context.set_context("context");
   context.set_version(1);
 
-  scoped_ptr<sync_pb::SyncEntity> type_root =
-      CreateUpdate(SyncableIdToProto(Id::CreateFromServerId("root")),
-                   Id::GetRoot().GetServerId(), SYNCED_NOTIFICATIONS);
-  type_root->set_server_defined_unique_tag(
-      ModelTypeToRootTag(SYNCED_NOTIFICATIONS));
-  type_root->set_folder(true);
-
   scoped_ptr<sync_pb::SyncEntity> e1 =
-      CreateUpdate(SyncableIdToProto(Id::CreateFromServerId("e1")),
-                   type_root->id_string(),
+      CreateUpdate(SyncableIdToProto(Id::CreateFromServerId("e1")), "",
                    SYNCED_NOTIFICATIONS);
 
   scoped_ptr<sync_pb::SyncEntity> e2 =
-      CreateUpdate(SyncableIdToProto(Id::CreateFromServerId("e2")),
-                   type_root->id_string(),
+      CreateUpdate(SyncableIdToProto(Id::CreateFromServerId("e2")), "",
                    SYNCED_NOTIFICATIONS);
   e2->set_version(kDefaultVersion + 100);
 
   // Add to the applicable updates list.
   SyncEntityList updates;
-  updates.push_back(type_root.get());
   updates.push_back(e1.get());
   updates.push_back(e2.get());
 
   // Process and apply updates.
   EXPECT_EQ(
       SYNCER_OK,
       handler.ProcessGetUpdatesResponse(progress, context, updates, &status));
   handler.ApplyUpdates(&status);
 
   // Verify none is deleted because they are unapplied during GC.
-  EXPECT_TRUE(EntryExists(type_root->id_string()));
+  EXPECT_TRUE(TypeRootExists(SYNCED_NOTIFICATIONS));
   EXPECT_TRUE(EntryExists(e1->id_string()));
   EXPECT_TRUE(EntryExists(e2->id_string()));
 
   // Process and apply again. Old entry is deleted but not root.
   progress.mutable_gc_directive()->set_version_watermark(kDefaultVersion + 20);
   EXPECT_EQ(SYNCER_OK,
             handler.ProcessGetUpdatesResponse(
                 progress, context, SyncEntityList(), &status));
   handler.ApplyUpdates(&status);
-  EXPECT_TRUE(EntryExists(type_root->id_string()));
   EXPECT_FALSE(EntryExists(e1->id_string()));
   EXPECT_TRUE(EntryExists(e2->id_string()));
 }
 
 TEST_F(DirectoryUpdateHandlerProcessUpdateTest, ContextVersion) {
   DirectoryTypeDebugInfoEmitter emitter(SYNCED_NOTIFICATIONS, &type_observers_);
   DirectoryUpdateHandler handler(dir(), SYNCED_NOTIFICATIONS,
                                  ui_worker(), &emitter);
   sessions::StatusController status;
   int field_number = GetSpecificsFieldNumberFromModelType(SYNCED_NOTIFICATIONS);
 
   sync_pb::DataTypeProgressMarker progress;
   progress.set_data_type_id(
       GetSpecificsFieldNumberFromModelType(SYNCED_NOTIFICATIONS));
   progress.set_token("token");
 
   sync_pb::DataTypeContext old_context;
   old_context.set_version(1);
   old_context.set_context("data");
   old_context.set_data_type_id(field_number);
 
-  scoped_ptr<sync_pb::SyncEntity> type_root =
-      CreateUpdate(SyncableIdToProto(Id::CreateFromServerId("root")),
-                   Id::GetRoot().GetServerId(), SYNCED_NOTIFICATIONS);
-  type_root->set_server_defined_unique_tag(
-      ModelTypeToRootTag(SYNCED_NOTIFICATIONS));
-  type_root->set_folder(true);
   scoped_ptr<sync_pb::SyncEntity> e1 =
-      CreateUpdate(SyncableIdToProto(Id::CreateFromServerId("e1")),
-                   type_root->id_string(),
+      CreateUpdate(SyncableIdToProto(Id::CreateFromServerId("e1")), "",
                    SYNCED_NOTIFICATIONS);
 
   SyncEntityList updates;
-  updates.push_back(type_root.get());
   updates.push_back(e1.get());
 
   // The first response should be processed fine.
   EXPECT_EQ(SYNCER_OK,
             handler.ProcessGetUpdatesResponse(
                 progress, old_context, updates, &status));
   handler.ApplyUpdates(&status);
 
-  EXPECT_TRUE(EntryExists(type_root->id_string()));
+  // The PREFERENCES root should be auto-created.
+  EXPECT_TRUE(TypeRootExists(SYNCED_NOTIFICATIONS));
+
   EXPECT_TRUE(EntryExists(e1->id_string()));
 
   {
     sync_pb::DataTypeContext dir_context;
     syncable::ReadTransaction trans(FROM_HERE, dir());
     trans.directory()->GetDataTypeContext(
         &trans, SYNCED_NOTIFICATIONS, &dir_context);
     EXPECT_EQ(old_context.SerializeAsString(), dir_context.SerializeAsString());
   }
 
   sync_pb::DataTypeContext new_context;
   new_context.set_version(0);
   new_context.set_context("old");
   new_context.set_data_type_id(field_number);
 
   scoped_ptr<sync_pb::SyncEntity> e2 =
-      CreateUpdate(SyncableIdToProto(Id::CreateFromServerId("e2")),
-                   type_root->id_string(),
+      CreateUpdate(SyncableIdToProto(Id::CreateFromServerId("e2")), "",
                    SYNCED_NOTIFICATIONS);
   updates.clear();
   updates.push_back(e2.get());
 
   // The second response, with an old context version, should result in an
   // error and the updates should be dropped.
   EXPECT_EQ(DATATYPE_TRIGGERED_RETRY,
             handler.ProcessGetUpdatesResponse(
                 progress, new_context, updates, &status));
   handler.ApplyUpdates(&status);
@@ skipping 20 matching lines @@
   sync_pb::DataTypeProgressMarker progress;
   progress.set_data_type_id(GetSpecificsFieldNumberFromModelType(ARTICLES));
   progress.set_token("token");
   progress.mutable_gc_directive()->set_version_watermark(kDefaultVersion + 10);
 
   sync_pb::DataTypeContext context;
   context.set_data_type_id(GetSpecificsFieldNumberFromModelType(ARTICLES));
   context.set_context("context");
   context.set_version(1);
 
-  scoped_ptr<sync_pb::SyncEntity> type_root =
-      CreateUpdate(SyncableIdToProto(Id::CreateFromServerId("root")),
-                   Id::GetRoot().GetServerId(), ARTICLES);
-  type_root->set_server_defined_unique_tag(ModelTypeToRootTag(ARTICLES));
-  type_root->set_folder(true);
-
-  scoped_ptr<sync_pb::SyncEntity> e1 =
-      CreateUpdate(SyncableIdToProto(Id::CreateFromServerId("e1")),
-                   type_root->id_string(),
-                   ARTICLES);
+  scoped_ptr<sync_pb::SyncEntity> e1 = CreateUpdate(
+      SyncableIdToProto(Id::CreateFromServerId("e1")), "", ARTICLES);
   sync_pb::AttachmentIdProto* attachment_id = e1->add_attachment_id();
   *attachment_id = CreateAttachmentIdProto();
 
   SyncEntityList updates;
-  updates.push_back(type_root.get());
   updates.push_back(e1.get());
 
   // Process and apply updates.
   EXPECT_EQ(
       SYNCER_OK,
       handler.ProcessGetUpdatesResponse(progress, context, updates, &status));
   handler.ApplyUpdates(&status);
 
-  ASSERT_TRUE(EntryExists(type_root->id_string()));
+  ASSERT_TRUE(TypeRootExists(ARTICLES));
   ASSERT_TRUE(EntryExists(e1->id_string()));
   {
     syncable::ReadTransaction trans(FROM_HERE, dir());
     syncable::Entry e(&trans,
                       syncable::GET_BY_ID,
                       Id::CreateFromServerId(e1->id_string()));
 
     // See that the attachment_metadata is correct.
     sync_pb::AttachmentMetadata attachment_metadata = e.GetAttachmentMetadata();
     ASSERT_EQ(1, attachment_metadata.record_size());
@@ skipping 728 matching lines @@
   const UpdateCounters& counters = GetArticlesUpdateCounters();
   EXPECT_EQ(1, counters.num_updates_applied);
   EXPECT_EQ(1, counters.num_local_overwrites);
   EXPECT_EQ(0, counters.num_server_overwrites);
   local_metadata = entry_factory()->GetLocalAttachmentMetadataForItem(handle);
   EXPECT_EQ(server_metadata.SerializeAsString(),
             local_metadata.SerializeAsString());
 }
 
 }  // namespace syncer