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

components/history/core/browser/top_sites_database.cc

 // Copyright (c) 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 "components/history/core/browser/top_sites_database.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
@@ skipping 327 matching lines @@
   // .4% SQLITE_FULL
   // nominal SQLITE_TOBIG, SQLITE_AUTH, and SQLITE_BUSY.  In the case of
   // thumbnail_database.cc, as soon as the recovery code landed, SQLITE_IOERR
   // shot to leadership.  If the I/O error is system-level, there is probably no
   // hope, but if it is restricted to something about the database file, it is
   // possible that the recovery code could be brought to bear.  In fact, it is
   // possible that running recovery would be a reasonable default when errors
   // are seen.
 
   // The default handling is to assert on debug and to ignore on release.
-  if (!sql::Connection::ShouldIgnoreSqliteError(extended_error))
+  if (!sql::Connection::IsExpectedSqliteError(extended_error))
     DLOG(FATAL) << db->GetErrorMessage();
 }
 
 }  // namespace
 
 // static
 const int TopSitesDatabase::kRankOfForcedURL = -1;
 
 // static
 const int TopSitesDatabase::kRankOfNonExistingURL = -2;
@@ skipping 367 matching lines @@
   db->set_error_callback(base::Bind(&DatabaseErrorCallback, db.get(), db_name));
   db->set_page_size(4096);
   db->set_cache_size(32);
 
   if (!db->Open(db_name))
     return NULL;
   return db.release();
 }
 
 }  // namespace history