More SQL statement usage regularization. Back-touch some

chrome/browser/history/download_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 "chrome/browser/history/download_database.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
@@ skipping 41 matching lines @@
   statement.BindString(col, path.value());
 }
 FilePath ColumnFilePath(sql::Statement& statement, int col) {
   return FilePath(statement.ColumnString(col));
 }
 
 #else
 
 // See above.
 void BindFilePath(sql::Statement& statement, const FilePath& path, int col) {
-  statement.BindString(col, UTF16ToUTF8(path.value()));
+  statement.BindString16(col, path.value());
 }
 FilePath ColumnFilePath(sql::Statement& statement, int col) {
-  return FilePath(UTF8ToUTF16(statement.ColumnString(col)));
+  return FilePath(statement.ColumnString16(col));
 }
 
 #endif
 
 // Key in the meta_table containing the next id to use for a new download in
 // this profile.
 static const char kNextDownloadId[] = "next_download_id";
 
 }  // namespace
 
@@ skipping 142 matching lines @@
     // TODO(benjhayden) if(info.id>next_id_){setvalue;next_id_=info.id;}
     meta_table_.SetValue(kNextDownloadId, ++next_id_);
 
     return db_handle;
   }
   return 0;
 }
 
 void DownloadDatabase::RemoveDownload(DownloadID db_handle) {
   CheckThread();
+
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "DELETE FROM downloads WHERE id=?"));
   statement.BindInt64(0, db_handle);
+
   statement.Run();
 }
 
 bool DownloadDatabase::RemoveDownloadsBetween(base::Time delete_begin,
                                               base::Time delete_end) {
   CheckThread();
   time_t start_time = delete_begin.ToTimeT();
   time_t end_time = delete_end.ToTimeT();
 
   // This does not use an index. We currently aren't likely to have enough
   // downloads where an index by time will give us a lot of benefit.
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "DELETE FROM downloads WHERE start_time >= ? AND start_time < ? "
       "AND (State = ? OR State = ? OR State = ?)"));
   statement.BindInt64(0, start_time);
   statement.BindInt64(
       1,
       end_time ? end_time : std::numeric_limits<int64>::max());
   statement.BindInt(2, DownloadItem::COMPLETE);
   statement.BindInt(3, DownloadItem::CANCELLED);
   statement.BindInt(4, DownloadItem::INTERRUPTED);
 
   return statement.Run();
 }
 
 }  // namespace history