[sql] sql::ScopedErrorIgnorer rename to sql::test::ScopedErrorExpecter

sync/syncable/directory_backing_store_unittest.cc

 // Copyright 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/syncable/directory_backing_store.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
-#include "sql/test/scoped_error_ignorer.h"
+#include "sql/test/scoped_error_expecter.h"
 #include "sql/test/test_helpers.h"
 #include "sync/base/sync_export.h"
 #include "sync/internal_api/public/base/node_ordinal.h"
 #include "sync/protocol/bookmark_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/on_disk_directory_backing_store.h"
 #include "sync/syncable/syncable-inl.h"
 #include "sync/test/directory_backing_store_corruption_testing.h"
 #include "sync/test/test_directory_backing_store.h"
@@ skipping 4179 matching lines @@
   ASSERT_TRUE(sql::test::CorruptSizeInHeader(GetDatabasePath()));
 
   {
     std::unique_ptr<OnDiskDirectoryBackingStoreForTest> dbs(
         new OnDiskDirectoryBackingStoreForTest(GetUsername(),
                                                GetDatabasePath()));
     dbs->SetCatastrophicErrorHandler(handler);
     ASSERT_TRUE(dbs->db_->has_error_callback());
     {
       // The corruption will be detected when we attempt to load the data. Use a
-      // ScopedErrorIgnorer to ensure we don't crash in debug builds.
-      sql::ScopedErrorIgnorer error_ignorer;
-      error_ignorer.IgnoreError(SQLITE_CORRUPT);
+      // ScopedErrorExpecter to ensure we don't crash in debug builds.
+      sql::test::ScopedErrorExpecter expecter;
+      expecter.ExpectError(SQLITE_CORRUPT);
       ASSERT_TRUE(LoadAndIgnoreReturnedData(dbs.get()));
-      ASSERT_TRUE(error_ignorer.CheckIgnoredErrors());
+      ASSERT_TRUE(expecter.SawExpectedErrors());
     }
     // See that the first open failed as expected.
     ASSERT_TRUE(dbs->DidFailFirstOpenAttempt());
   }
 
   // At this point the handler has been posted but not executed.
   ASSERT_FALSE(was_called);
   // Pump the message loop and see that it is executed.
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(was_called);
@@ skipping 32 matching lines @@
   ASSERT_FALSE(dbs->SaveChanges(snapshot));
   // At this point the handler has been posted but not executed.
   ASSERT_FALSE(was_called);
   // Pump the message loop and see that it is executed.
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(was_called);
 }
 
 }  // namespace syncable
 }  // namespace syncer