Sync: Small refactoring of Directory::CheckTreeInvariants

sync/syncable/directory.cc

 // Copyright 2013 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.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/base64.h"
@@ skipping 1208 matching lines @@
           parentid = parent.GetParentId();
           if (!SyncAssert(--safety_count > 0, FROM_HERE,
                           "Count should be greater than zero.", trans))
             return false;
         }
       }
     }
     int64 base_version = e.GetBaseVersion();
     int64 server_version = e.GetServerVersion();
     bool using_unique_client_tag = !e.GetUniqueClientTag().empty();
-    bool is_type_root_folder =
-        parentid.IsRoot() &&
-        e.GetUniqueServerTag() == ModelTypeToRootTag(e.GetModelType());
     if (CHANGES_VERSION == base_version || 0 == base_version) {
+      ModelType model_type = e.GetModelType();
+      bool is_client_creatable_type_root_folder =
+          parentid.IsRoot() &&
+          IsTypeWithClientGeneratedRoot(model_type) &&
+          e.GetUniqueServerTag() == ModelTypeToRootTag(model_type);
       if (e.GetIsUnappliedUpdate()) {
         // Must be a new item, or a de-duplicated unique client tag
+        // that was created both locally and remotely, or a type root folder
         // that was created both locally and remotely.
-        if (!(using_unique_client_tag || is_type_root_folder)) {
+        if (!(using_unique_client_tag ||
+              is_client_creatable_type_root_folder)) {
           if (!SyncAssert(e.GetIsDel(), FROM_HERE,
                           "The entry should have been deleted.", trans))
             return false;
         }
         // It came from the server, so it must have a server ID.
         if (!SyncAssert(id.ServerKnows(), FROM_HERE,
                         "The id should be from a server.",
                         trans))
           return false;
       } else {
         if (e.GetIsDir()) {
           // TODO(chron): Implement this mode if clients ever need it.
           // For now, you can't combine a client tag and a directory.
           if (!SyncAssert(!using_unique_client_tag, FROM_HERE,
                           "Directory cannot have a client tag.",
                           trans))
             return false;
         }
-        if (is_type_root_folder) {
-          // This must be a locally created type root folder
+        if (is_client_creatable_type_root_folder) {
+          // This must be a locally created type root folder.
           if (!SyncAssert(
                   !e.GetIsUnsynced(), FROM_HERE,
                   "Locally created type root folders should not be unsynced.",
                   trans))
             return false;
 
           if (!SyncAssert(
                   !e.GetIsDel(), FROM_HERE,
                   "Locally created type root folders should not be deleted.",
                   trans))
@@ skipping 274 matching lines @@
   // TODO(maniscalco): Eliminate redundant metadata storage (bug 415203).
   std::set_difference(not_on_server_id_set.begin(),
                       not_on_server_id_set.end(),
                       on_server_id_set.begin(),
                       on_server_id_set.end(),
                       std::inserter(*id_set, id_set->end()));
 }
 
 }  // namespace syncable
 }  // namespace syncer