Check node references during sync DB init

chrome/browser/sync/syncable/directory_manager.cc

 // Copyright (c) 2011 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 "chrome/browser/sync/syncable/directory_manager.h"
 
 #include <map>
 #include <set>
 #include <iterator>
 
+#include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/port.h"
 #include "base/string_util.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 
 using browser_sync::Cryptographer;
 
 namespace syncable {
 
@@ skipping 44 matching lines @@
           << "Can't open more than one directory.";
       opened = *was_open = true;
     }
   }
 
   if (opened)
     return syncable::OPENED;
   // Otherwise, open it.
 
   scoped_ptr<Directory> dir(new Directory);
-  const DirOpenResult result = dir->Open(path, name, delegate);
+  DirOpenResult result = dir->Open(path, name, delegate);
+
+  if (syncable::FAILED_LOGICAL_CORRUPTION == result) {
+    // In this case, wipe out the directory and try again.
+    VLOG(ERROR) << "Database consistency checks failed.  "
+        << "Will re-create sync database at "
+        << path.LossyDisplayName();
+    dir.reset(new Directory);

[tim (not reviewing), 2011/11/17 18:39:57]

style nit - use Directory()

+    file_util::Delete(path, false);
+    result = dir->Open(path, name, delegate);
+  }
+
   if (syncable::OPENED == result) {
     base::AutoLock lock(lock_);
     managed_directory_ = dir.release();
   }
+
   return result;
 }
 
 // Marks a directory as closed.  It might take a while until all the file
 // handles and resources are freed by other threads.
 void DirectoryManager::Close(const std::string& name) {
   // Erase from mounted and opened directory lists.
   {
     base::AutoLock lock(lock_);
     if (!managed_directory_ ||
@@ skipping 39 matching lines @@
   return dir_;
 }
 
 ScopedDirLookup::operator Directory* () const {
   CHECK(good_checked_);
   DCHECK(good_);
   return dir_;
 }
 
 }  // namespace syncable