Sync: Small refactoring of Directory::CheckTreeInvariants

sync/engine/syncer_util.cc

 // Copyright 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_util.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 249 matching lines @@
       }
       if (entry->GetParentId() != new_parent) {
         if (!entry->GetIsDel() && !IsLegalNewParent(trans, id, new_parent)) {
           DVLOG(1) << "Not updating item " << id
                    << ", illegal new parent (would cause loop).";
           return CONFLICT_HIERARCHY;
         }
       }
     } else {
       // new_parent is unset.
-      DCHECK(!IsTypeWithServerGeneratedRoot(type));
+      DCHECK(IsTypeWithClientGeneratedRoot(type));
     }
   } else if (entry->GetIsDir()) {
     Directory::Metahandles handles;
     trans->directory()->GetChildHandlesById(trans, id, &handles);
     if (!handles.empty()) {
       // If we have still-existing children, then we need to deal with
       // them before we can process this change.
       DVLOG(1) << "Not deleting directory; it's not empty " << *entry;
       return CONFLICT_HIERARCHY;
     }
@@ skipping 388 matching lines @@
   if (update.version() < target->GetServerVersion()) {
     LOG(WARNING) << "Update older than current server version for "
                  << *target << " Update:"
                  << SyncerProtoUtil::SyncEntityDebugString(update);
     return VERIFY_SUCCESS;  // Expected in new sync protocol.
   }
   return VERIFY_UNDECIDED;
 }
 
 }  // namespace syncer