Remove dependency on server generated type root folders

sync/syncable/entry_kernel.cc

 // Copyright (c) 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.
 
 #include "sync/syncable/entry_kernel.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "sync/protocol/proto_value_conversions.h"
 #include "sync/syncable/syncable_enum_conversions.h"
 #include "sync/util/cryptographer.h"
@@ skipping 39 matching lines @@
 }
 
 bool EntryKernel::ShouldMaintainPosition() const {
   // We maintain positions for all bookmarks, except those that are
   // server-created top-level folders.
   return (GetModelTypeFromSpecifics(ref(SPECIFICS)) == syncer::BOOKMARKS)
       && !(!ref(UNIQUE_SERVER_TAG).empty() && ref(IS_DIR));
 }
 
 bool EntryKernel::ShouldMaintainHierarchy() const {
-  // We maintain hierarchy for bookmarks, device info, and top-level folders,
+  // We maintain hierarchy for bookmarks and top-level folders,
   // but no other types.  Note that the Nigori node consists of a single
   // top-level folder, so it's included in this set.
   return (GetModelTypeFromSpecifics(ref(SPECIFICS)) == syncer::BOOKMARKS)
       || (!ref(UNIQUE_SERVER_TAG).empty());
 }
 
 namespace {
 
 // Utility function to loop through a set of enum values and add the
 // field keys/values in the kernel to the given dictionary.
@@ skipping 157 matching lines @@
 base::DictionaryValue* EntryKernelMutationToValue(
     const EntryKernelMutation& mutation) {
   base::DictionaryValue* dict = new base::DictionaryValue();
   dict->Set("original", mutation.original.ToValue(NULL));
   dict->Set("mutated", mutation.mutated.ToValue(NULL));
   return dict;
 }
 
 }  // namespace syncer
 }  // namespace syncable