Sync: Don't set/use Parent ID for non-hierarchical sync data types.

sync/engine/syncer_proto_util.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/engine/syncer_proto_util.h"
 
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "google_apis/google_api_keys.h"
 #include "sync/engine/net/server_connection_manager.h"
@@ skipping 516 matching lines @@
 bool SyncerProtoUtil::ShouldMaintainPosition(
     const sync_pb::SyncEntity& sync_entity) {
   // Maintain positions for bookmarks that are not server-defined top-level
   // folders.
   return GetModelType(sync_entity) == BOOKMARKS
       && !(sync_entity.folder() &&
            !sync_entity.server_defined_unique_tag().empty());
 }
 
 // static
+bool SyncerProtoUtil::ShouldMaintainHierarchy(
+    const sync_pb::SyncEntity& sync_entity) {
+  // Maintain hierarchy for bookmarks or top-level items.
+  return GetModelType(sync_entity) == BOOKMARKS ||
+         sync_entity.parent_id_string() == "0";

[Nicolas Zea, 2015/07/29 17:58:09]

nit: why check parent id string rather than model type == TOP_LEVEL_FOLDER

[stanisc, 2015/07/29 21:37:07]

This is for compatibility with some tests that create non-folder items at the
top level.

+}
+
+// static
 const std::string& SyncerProtoUtil::NameFromSyncEntity(
     const sync_pb::SyncEntity& entry) {
   if (entry.has_non_unique_name())
     return entry.non_unique_name();
   return entry.name();
 }
 
 // static
 const std::string& SyncerProtoUtil::NameFromCommitEntryResponse(
     const sync_pb::CommitResponse_EntryResponse& entry) {
@@ skipping 50 matching lines @@
 std::string SyncerProtoUtil::ClientToServerResponseDebugString(
     const ClientToServerResponse& response) {
   // Add more handlers as needed.
   std::string output;
   if (response.has_get_updates())
     output.append(GetUpdatesResponseString(response.get_updates()));
   return output;
 }
 
 }  // namespace syncer