Sync: Improve handling of database load failures

chrome/browser/sync/syncable/directory_backing_store_unittest.cc

Index: chrome/browser/sync/syncable/directory_backing_store_unittest.cc
diff --git a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
index 88536cf249ab5ba6a214e16fa3c3164cd89539fd..461fac24483fce11b931c7bce2e62e29436d54cb 100644
--- a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
+++ b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
@@ -2082,15 +2082,7 @@ TEST_F(DirectoryBackingStoreTest, Corruption) {
     scoped_ptr<DirectoryBackingStore> dbs(
         new DirectoryBackingStore(GetUsername(), GetDatabasePath()));
 
-    // In release mode, we expect the sync database to nuke itself and start
-    // over if it detects invalid/corrupted data.
-#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
-    EXPECT_TRUE(dbs->BeginLoad());
-#elif defined(NDEBUG) && defined(DCHECK_ALWAYS_ON)
-    EXPECT_DEATH(dbs->BeginLoad(), "stmt_");
-#else
-    EXPECT_DEATH(dbs->BeginLoad(), "sqlite error");
-#endif
+    EXPECT_FALSE(dbs->BeginLoad());
   }
 }