sql: Remove basictypes.h includes.

sql/statement.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 "sql/statement.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/sqlite/sqlite3.h"
@@ skipping 94 matching lines @@
 }
 
 bool Statement::BindInt(int col, int val) {
   DCHECK(!stepped_);
   if (!is_valid())
     return false;
 
   return CheckOk(sqlite3_bind_int(ref_->stmt(), col + 1, val));
 }
 
-bool Statement::BindInt64(int col, int64 val) {
+bool Statement::BindInt64(int col, int64_t val) {
   DCHECK(!stepped_);
   if (!is_valid())
     return false;
 
   return CheckOk(sqlite3_bind_int64(ref_->stmt(), col + 1, val));
 }
 
 bool Statement::BindDouble(int col, double val) {
   DCHECK(!stepped_);
   if (!is_valid())
@@ skipping 74 matching lines @@
   return !!ColumnInt(col);
 }
 
 int Statement::ColumnInt(int col) const {
   if (!CheckValid())
     return 0;
 
   return sqlite3_column_int(ref_->stmt(), col);
 }
 
-int64 Statement::ColumnInt64(int col) const {
+int64_t Statement::ColumnInt64(int col) const {
   if (!CheckValid())
     return 0;
 
   return sqlite3_column_int64(ref_->stmt(), col);
 }
 
 double Statement::ColumnDouble(int col) const {
   if (!CheckValid())
     return 0;
 
@@ skipping 71 matching lines @@
 
   const void* data = sqlite3_column_blob(ref_->stmt(), col);
   int len = sqlite3_column_bytes(ref_->stmt(), col);
   if (data && len > 0) {
     val->resize(len);
     memcpy(&(*val)[0], data, len);
   }
   return true;
 }
 
-bool Statement::ColumnBlobAsVector(
-    int col,
-    std::vector<unsigned char>* val) const {
+bool Statement::ColumnBlobAsVector(int col,
+                                   std::vector<unsigned char>* val) const {

[Scott Hess - ex-Googler, 2015/05/11 20:34:23]

If this is clang-format results, then that's fine.  If not, please revert this
piece, no need to inject irrelevant whitespace changes.

[tfarina, 2015/05/11 20:39:07]

It was. Sorry, I should not have mixed this with this change, it happened while
I was scanning this file. Reverted.

   return ColumnBlobAsVector(col, reinterpret_cast< std::vector<char>* >(val));
 }
 
 const char* Statement::GetSQLStatement() {
   return sqlite3_sql(ref_->stmt());
 }
 
 bool Statement::CheckOk(int err) const {
   // Binding to a non-existent variable is evidence of a serious error.
   // TODO(gbillock,shess): make this invalidate the statement so it
   // can't wreak havoc.
   if (err == SQLITE_RANGE)
     DLOG(FATAL) << "Bind value out of range";
   return err == SQLITE_OK;
 }
 
 int Statement::CheckError(int err) {
   // Please don't add DCHECKs here, OnSqliteError() already has them.
   succeeded_ = (err == SQLITE_OK || err == SQLITE_ROW || err == SQLITE_DONE);
   if (!succeeded_ && ref_.get() && ref_->connection())
     return ref_->connection()->OnSqliteError(err, this, NULL);
   return err;
 }
 
 }  // namespace sql