Revert 110384 - Revert 110356 - 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
===================================================================
--- chrome/browser/sync/syncable/directory_backing_store_unittest.cc	(revision 110386)
+++ chrome/browser/sync/syncable/directory_backing_store_unittest.cc	(working copy)
@@ -2082,15 +2082,7 @@
     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());
   }
 }