diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-02 05:01:42 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-02 05:01:42 +0000 |
| commit | 765b445022c7f2a24bc862b45d48ece4ca9a77e1 (patch) | |
| tree | 9f351b1203bbfd02fae7018a1f11e2f15b6eeacb /chrome/browser/thumbnail_store_unittest.cc | |
| parent | eb6f2c542d7405788d668a762282b66655836e1d (diff) | |
| download | chromium_src-765b445022c7f2a24bc862b45d48ece4ca9a77e1.zip chromium_src-765b445022c7f2a24bc862b45d48ece4ca9a77e1.tar.gz chromium_src-765b445022c7f2a24bc862b45d48ece4ca9a77e1.tar.bz2 | |
Convert history to use new sql wrappers. Enhance wrappers in several ways to
support the needs of history.
BUG=none
TEST=covered by unit tests
Review URL: http://codereview.chromium.org/246053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27832 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/thumbnail_store_unittest.cc')
| -rw-r--r-- | chrome/browser/thumbnail_store_unittest.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/thumbnail_store_unittest.cc b/chrome/browser/thumbnail_store_unittest.cc index cd8f146..cd249f3 100644 --- a/chrome/browser/thumbnail_store_unittest.cc +++ b/chrome/browser/thumbnail_store_unittest.cc @@ -9,6 +9,8 @@ #include "chrome/browser/thumbnail_store.h" +#include "app/sql/connection.h" +#include "app/sql/statement.h" #include "base/time.h" #include "base/file_path.h" #include "base/file_util.h" @@ -18,8 +20,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/ref_counted_util.h" #include "chrome/common/thumbnail_score.h" -#include "chrome/common/sqlite_compiled_statement.h" -#include "chrome/common/sqlite_utils.h" #include "chrome/tools/profiles/thumbnail-inl.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" @@ -186,17 +186,17 @@ TEST_F(ThumbnailStoreTest, RetrieveFromDisk) { store_->cache_->clear(); // Clear it from the cache. // Read from the DB. - SQLITE_UNIQUE_STATEMENT(statement, *store_->statement_cache_, - "SELECT * FROM thumbnails"); - EXPECT_TRUE(statement->step() == SQLITE_ROW); - GURL url(statement->column_string(0)); - ThumbnailScore score(statement->column_double(1), - statement->column_bool(2), - statement->column_bool(3), + sql::Statement statement(store_->db_.GetUniqueStatement( + "SELECT * FROM thumbnails")); + EXPECT_TRUE(statement.Step()); + GURL url(statement.ColumnString(0)); + ThumbnailScore score(statement.ColumnDouble(1), + statement.ColumnBool(2), + statement.ColumnBool(3), base::Time::FromInternalValue( - statement->column_int64(4))); + statement.ColumnInt64(4))); scoped_refptr<RefCountedBytes> data = new RefCountedBytes; - EXPECT_TRUE(statement->column_blob_as_vector(5, &data->data)); + statement.ColumnBlobAsVector(5, &data->data); EXPECT_TRUE(url == url_); EXPECT_TRUE(score.Equals(score_)); |