More SQL statement usage regularization. Back-touch some

chrome/browser/importer/nss_decryptor.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/importer/nss_decryptor.h"
 
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 222 matching lines @@
 }
 
 bool NSSDecryptor::ReadAndParseSignons(const FilePath& sqlite_file,
     std::vector<webkit::forms::PasswordForm>* forms) {
   sql::Connection db;
   if (!db.Open(sqlite_file))
     return false;
 
   const char* query = "SELECT hostname FROM moz_disabledHosts";
   sql::Statement s(db.GetUniqueStatement(query));
-  if (!s)
+  if (!s.is_valid())
     return false;
 
   GURL::Replacements rep;
   rep.ClearQuery();
   rep.ClearRef();
   rep.ClearUsername();
   rep.ClearPassword();
   // Read domains for which passwords are never saved.
   while (s.Step()) {
     webkit::forms::PasswordForm form;
     form.origin = GURL(s.ColumnString(0)).ReplaceComponents(rep);
     form.signon_realm = form.origin.GetOrigin().spec();
     form.blacklisted_by_user = true;
     forms->push_back(form);
   }
 
   const char* query2 = "SELECT hostname, httpRealm, formSubmitURL, "
                        "usernameField, passwordField, encryptedUsername, "
                        "encryptedPassword FROM moz_logins";
 
   sql::Statement s2(db.GetUniqueStatement(query2));
-  if (!s2)
+  if (!s2.is_valid())
     return false;
 
   while (s2.Step()) {
     GURL url;
     std::string realm(s2.ColumnString(1));
     if (!realm.empty()) {
       // In this case, the scheme may not exsit. Assume HTTP.
       std::string host(s2.ColumnString(0));
       if (host.find("://") == std::string::npos)
         host = "http://" + host;
@@ skipping 14 matching lines @@
     // The user name, password and action.
     form.username_element = s2.ColumnString16(3);
     form.username_value = Decrypt(s2.ColumnString(5));
     form.password_element = s2.ColumnString16(4);
     form.password_value = Decrypt(s2.ColumnString(6));
     form.action = GURL(s2.ColumnString(2)).ReplaceComponents(rep);
     forms->push_back(form);
   }
   return true;
 }