More SQL statement usage regularization. Back-touch some

chrome/browser/diagnostics/sqlite_diagnostics.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 "chrome/browser/diagnostics/sqlite_diagnostics.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
@@ skipping 35 matching lines @@
 
     int errors = 0;
     { // This block scopes the lifetime of the db objects.
       sql::Connection db;
       db.set_exclusive_locking();
       if (!db.Open(path)) {
         RecordFailure(ASCIIToUTF16("Cannot open DB. Possibly corrupted"));
         return true;
       }
       sql::Statement s(db.GetUniqueStatement("PRAGMA integrity_check;"));
-      if (!s) {
+      if (!s.is_valid()) {
         int error = db.GetErrorCode();
         if (SQLITE_BUSY == error) {
           RecordFailure(ASCIIToUTF16("DB locked by another process"));
         } else {
           string16 str(ASCIIToUTF16("Pragma failed. Error: "));
           str += base::IntToString16(error);
           RecordFailure(str);
         }
         return false;
       }
@@ skipping 91 matching lines @@
                                  appcache_db);
 }
 
 DiagnosticTest* MakeSqliteWebDatabaseTrackerDbTest() {
   FilePath databases_dir(webkit_database::kDatabaseDirectoryName);
   FilePath tracker_db =
       databases_dir.Append(webkit_database::kTrackerDatabaseFileName);
   return new SqliteIntegrityTest(false, ASCIIToUTF16("DatabaseTracker DB"),
                                  tracker_db);
 }