diff options
| author | tfarina <tfarina@chromium.org> | 2015-05-11 15:31:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-11 22:31:49 +0000 |
| commit | 720d4f346cee3fa9ea9c58b845550e7066a80ec2 (patch) | |
| tree | e452763cf49776c93a2779e8e08fc90b51690ee4 /sql/test | |
| parent | c16f8dcdc00218681934a1425f53c9badefbe01a (diff) | |
| download | chromium_src-720d4f346cee3fa9ea9c58b845550e7066a80ec2.zip chromium_src-720d4f346cee3fa9ea9c58b845550e7066a80ec2.tar.gz chromium_src-720d4f346cee3fa9ea9c58b845550e7066a80ec2.tar.bz2 | |
sql: Remove basictypes.h includes.
* Use the standard integer types from stdint.h instead.
* Use macros.h for the DISALLOW_COPY_AND_ASSIGN macro.
BUG=138542
TEST=sql_unittests
R=shess@chromium.org
Review URL: https://codereview.chromium.org/1133053004
Cr-Commit-Position: refs/heads/master@{#329256}
Diffstat (limited to 'sql/test')
| -rw-r--r-- | sql/test/scoped_error_ignorer.h | 2 | ||||
| -rw-r--r-- | sql/test/test_helpers.cc | 2 | ||||
| -rw-r--r-- | sql/test/test_helpers.h | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/sql/test/scoped_error_ignorer.h b/sql/test/scoped_error_ignorer.h index 79559a1..6d1c5df 100644 --- a/sql/test/scoped_error_ignorer.h +++ b/sql/test/scoped_error_ignorer.h @@ -7,7 +7,7 @@ #include <set> -#include "base/basictypes.h" +#include "base/macros.h" #include "sql/connection.h" // This is not strictly necessary for the operation of ScopedErrorIgnorer, but diff --git a/sql/test/test_helpers.cc b/sql/test/test_helpers.cc index 72d42c6..361b336 100644 --- a/sql/test/test_helpers.cc +++ b/sql/test/test_helpers.cc @@ -85,7 +85,7 @@ bool CorruptSizeInHeader(const base::FilePath& db_path) { if (1u != fread(header, sizeof(header), 1, file.get())) return false; - int64 db_size = 0; + int64_t db_size = 0; if (!base::GetFileSize(db_path, &db_size)) return false; diff --git a/sql/test/test_helpers.h b/sql/test/test_helpers.h index d9dda22..e93b207 100644 --- a/sql/test/test_helpers.h +++ b/sql/test/test_helpers.h @@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" |