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

content/browser/databases_table_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 <stddef.h>
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
-#include "sql/test/scoped_error_ignorer.h"
+#include "sql/test/scoped_error_expecter.h"
 #include "storage/browser/database/databases_table.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/sqlite/sqlite3.h"
 
 using base::ASCIIToUTF16;
 using storage::DatabaseDetails;
 using storage::DatabasesTable;
 
 namespace content {
 
 static void CheckDetailsAreEqual(const DatabaseDetails& d1,
                                  const DatabaseDetails& d2) {
   EXPECT_EQ(d1.origin_identifier, d2.origin_identifier);
   EXPECT_EQ(d1.database_name, d2.database_name);
   EXPECT_EQ(d1.description, d2.description);
   EXPECT_EQ(d1.estimated_size, d2.estimated_size);
 }
 
 static bool DatabasesTableIsEmpty(sql::Connection* db) {
   sql::Statement statement(db->GetCachedStatement(
       SQL_FROM_HERE, "SELECT COUNT(*) FROM Databases"));
   return (statement.is_valid() && statement.Step() && !statement.ColumnInt(0));
 }
 
 TEST(DatabasesTableTest, TestIt) {
   // Initialize the 'Databases' table.
   sql::Connection db;
 
-  sql::ScopedErrorIgnorer ignore_errors;
+  sql::test::ScopedErrorExpecter expecter;
   // TODO(shess): Suppressing SQLITE_CONSTRAINT because the code
   // expects that and handles the resulting error.  Consider revising
   // the code to use INSERT OR IGNORE (which would not throw
   // SQLITE_CONSTRAINT) and then check ChangeCount() to see if any
   // changes were made.
-  ignore_errors.IgnoreError(SQLITE_CONSTRAINT);
+  expecter.ExpectError(SQLITE_CONSTRAINT);
 
   // Initialize the temp dir and the 'Databases' table.
   EXPECT_TRUE(db.OpenInMemory());
   DatabasesTable databases_table(&db);
   EXPECT_TRUE(databases_table.Init());
 
   // The 'Databases' table should be empty.
   EXPECT_TRUE(DatabasesTableIsEmpty(&db));
 
   // Create the details for a databases.
@@ skipping 83 matching lines @@
       details_in1.origin_identifier, details_in1.database_name));
   EXPECT_FALSE(databases_table.GetDatabaseDetails(
       details_in1.origin_identifier,
       details_in1.database_name,
       &details_out1));
 
   // Check that trying to delete a record that doesn't exist fails.
   EXPECT_FALSE(databases_table.DeleteDatabaseDetails(
       "unknown_origin", ASCIIToUTF16("unknown_database")));
 
-  ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
+  ASSERT_TRUE(expecter.SawExpectedErrors());
 }
 
 }  // namespace content