[Sync] Do not check IS_DIR bit on nigori node

sync/internal_api/base_node.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/internal_api/public/base_node.h"
 
 #include <stdint.h>
 
 #include <stack>
 
@@ skipping 145 matching lines @@
   return GetEntry()->GetMtime();
 }
 
 bool BaseNode::GetIsFolder() const {
   return GetEntry()->GetIsDir();
 }
 
 bool BaseNode::GetIsPermanentFolder() const {
   bool is_permanent_folder = !GetEntry()->GetUniqueServerTag().empty();
   if (is_permanent_folder) {
-    // If the node is a permanent folder it must also have IS_DIR bit set.
-    DCHECK(GetIsFolder());
+    // If the node is a permanent folder it must also have IS_DIR bit set,
+    // except some nigori nodes on old accounts.
+    DCHECK(GetIsFolder() || GetModelType() == NIGORI);
   }
   return is_permanent_folder;
 }
 
 std::string BaseNode::GetTitle() const {
   std::string result;
   // TODO(zea): refactor bookmarks to not need this functionality.
   if (BOOKMARKS == GetModelType() &&
       GetEntry()->GetSpecifics().has_encrypted()) {
     // Special case for legacy bookmarks dealing with encryption.
@@ skipping 103 matching lines @@
     const sync_pb::EntitySpecifics& specifics) {
   ModelType type = GetModelTypeFromSpecifics(specifics);
   DCHECK_NE(UNSPECIFIED, type);
   if (GetModelType() != UNSPECIFIED) {
     DCHECK_EQ(GetModelType(), type);
   }
   unencrypted_data_.CopyFrom(specifics);
 }
 
 }  // namespace syncer