Sync: Improve handling of database load failures

chrome/browser/sync/syncable/directory_backing_store_unittest.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 "testing/gtest/include/gtest/gtest.h"
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 2064 matching lines @@
         new DirectoryBackingStore(GetUsername(), GetDatabasePath()));
     EXPECT_TRUE(dbs->BeginLoad());
   }
   std::string bad_data("BAD DATA");
   EXPECT_TRUE(file_util::WriteFile(GetDatabasePath(), bad_data.data(),
                                    bad_data.size()));
   {
     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());
   }
 }
 
 TEST_F(DirectoryBackingStoreTest, DeleteEntries) {
   SetUpCurrentDatabaseAndCheckVersion();
   scoped_ptr<DirectoryBackingStore> dbs(
       new DirectoryBackingStore(GetUsername(), GetDatabasePath()));
   dbs->BeginLoad();
   MetahandlesIndex index;
   STLElementDeleter<MetahandlesIndex> index_deleter(&index);
@@ skipping 29 matching lines @@
 
   STLDeleteElements(&index);
   dbs->LoadEntries(&index);
   EXPECT_EQ(0U, index.size());
 
   dbs->EndLoad();
   dbs->EndSave();
 }
 
 }  // namespace syncable