More SQL statement usage regularization. Back-touch some

chrome/browser/importer/safari_importer.mm

 // 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 <Cocoa/Cocoa.h>
 
 #include "chrome/browser/importer/safari_importer.h"
 
 #include <map>
 #include <vector>
@@ skipping 124 matching lines @@
       stringByAppendingPathComponent:@"WebpageIcons.db"];
 
   const char* db_path = [favicons_db_path fileSystemRepresentation];
   return db->Open(FilePath(db_path));
 }
 
 void SafariImporter::ImportFaviconURLs(sql::Connection* db,
                                        FaviconMap* favicon_map) {
   const char* query = "SELECT iconID, url FROM PageURL;";
   sql::Statement s(db->GetUniqueStatement(query));
-  if (!s)
-    return;
 
   while (s.Step() && !cancelled()) {
     int64 icon_id = s.ColumnInt64(0);
     GURL url = GURL(s.ColumnString(1));
     (*favicon_map)[icon_id].insert(url);
   }
 }
 
 void SafariImporter::LoadFaviconData(
     sql::Connection* db,
     const FaviconMap& favicon_map,
     std::vector<history::ImportedFaviconUsage>* favicons) {
   const char* query = "SELECT i.url, d.data "
                       "FROM IconInfo i JOIN IconData d "
                       "ON i.iconID = d.iconID "
                       "WHERE i.iconID = ?;";
   sql::Statement s(db->GetUniqueStatement(query));
-  if (!s)
-    return;
 
   for (FaviconMap::const_iterator i = favicon_map.begin();
        i != favicon_map.end(); ++i) {
     s.Reset();
     s.BindInt64(0, i->first);
     if (s.Step()) {
       history::ImportedFaviconUsage usage;
 
       usage.favicon_url = GURL(s.ColumnString(0));
       if (!usage.favicon_url.is_valid())
@@ skipping 218 matching lines @@
     if (!last_visit_str)
       continue;
 
     // Convert Safari's last visit time to Unix Epoch time.
     double seconds_since_unix_epoch = HistoryTimeToEpochTime(last_visit_str);
     row.set_last_visit(base::Time::FromDoubleT(seconds_since_unix_epoch));
 
     history_items->push_back(row);
   }
 }