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

components/password_manager/core/browser/affiliation_database_unittest.cc

 // Copyright 2014 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 "components/password_manager/core/browser/affiliation_database.h"
 
 #include <stdint.h>
 
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
-#include "sql/test/scoped_error_ignorer.h"
+#include "sql/test/scoped_error_expecter.h"
 #include "sql/test/test_helpers.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/sqlite/sqlite3.h"
 
 namespace password_manager {
 
 namespace {
 
 const char kTestFacetURI1[] = "https://alpha.example.com";
@@ skipping 82 matching lines @@
 };
 
 TEST_F(AffiliationDatabaseTest, Store) {
   LOG(ERROR) << "During this test, SQL errors (number 19) will be logged to "
                 "the console. This is expected.";
 
   ASSERT_NO_FATAL_FAILURE(StoreInitialTestData());
 
   // Verify that duplicate equivalence classes are not allowed to be stored.
   {
-    sql::ScopedErrorIgnorer error_ignorer;
-    error_ignorer.IgnoreError(SQLITE_CONSTRAINT);
+    sql::test::ScopedErrorExpecter expecter;
+    expecter.ExpectError(SQLITE_CONSTRAINT);
     AffiliatedFacetsWithUpdateTime duplicate = TestEquivalenceClass1();
     EXPECT_FALSE(db().Store(duplicate));
-    EXPECT_TRUE(error_ignorer.CheckIgnoredErrors());
+    EXPECT_TRUE(expecter.SawExpectedErrors());
   }
 
   // Verify that intersecting equivalence classes are not allowed to be stored.
   {
-    sql::ScopedErrorIgnorer error_ignorer;
-    error_ignorer.IgnoreError(SQLITE_CONSTRAINT);
+    sql::test::ScopedErrorExpecter expecter;
+    expecter.ExpectError(SQLITE_CONSTRAINT);
     AffiliatedFacetsWithUpdateTime intersecting;
     intersecting.facets.push_back(FacetURI::FromCanonicalSpec(kTestFacetURI3));
     intersecting.facets.push_back(FacetURI::FromCanonicalSpec(kTestFacetURI4));
     EXPECT_FALSE(db().Store(intersecting));
-    EXPECT_TRUE(error_ignorer.CheckIgnoredErrors());
+    EXPECT_TRUE(expecter.SawExpectedErrors());
   }
 }
 
 TEST_F(AffiliationDatabaseTest, GetAllAffiliations) {
   std::vector<AffiliatedFacetsWithUpdateTime> affiliations;
 
   // Empty database should not return any equivalence classes.
   db().GetAllAffiliations(&affiliations);
   EXPECT_EQ(0u, affiliations.size());
 
@@ skipping 159 matching lines @@
 // Verify that all files get deleted.
 TEST_F(AffiliationDatabaseTest, Delete) {
   ASSERT_NO_FATAL_FAILURE(StoreInitialTestData());
   CloseDatabase();
 
   AffiliationDatabase::Delete(db_path());
   EXPECT_TRUE(base::IsDirectoryEmpty(db_path().DirName()));
 }
 
 }  // namespace password_manager