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/history/history_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/history/history_unittest.cc')
| -rw-r--r-- | chrome/browser/history/history_unittest.cc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc index 55bac89..be84f01 100644 --- a/chrome/browser/history/history_unittest.cc +++ b/chrome/browser/history/history_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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. @@ -20,6 +20,8 @@ #include <time.h> #include <algorithm> +#include "app/sql/connection.h" +#include "app/sql/statement.h" #include "base/basictypes.h" #include "base/file_path.h" #include "base/file_util.h" @@ -39,7 +41,6 @@ #include "chrome/browser/history/page_usage_data.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/notification_service.h" -#include "chrome/common/sqlite_utils.h" #include "chrome/common/thumbnail_score.h" #include "chrome/tools/profiles/thumbnail-inl.h" #include "testing/gtest/include/gtest/gtest.h" @@ -738,19 +739,16 @@ TEST(HistoryProfileTest, TypicalProfileVersion) { int cur_version = HistoryDatabase::GetCurrentVersion(); - sqlite3* db; - ASSERT_EQ(SQLITE_OK, OpenSqliteDb(file, &db)); + sql::Connection db; + ASSERT_TRUE(db.Open(file)); { - SQLStatement s; - ASSERT_EQ(SQLITE_OK, s.prepare(db, + sql::Statement s(db.GetUniqueStatement( "SELECT value FROM meta WHERE key = 'version'")); - EXPECT_EQ(SQLITE_ROW, s.step()); - int file_version = s.column_int(0); + EXPECT_TRUE(s.Step()); + int file_version = s.ColumnInt(0); EXPECT_EQ(cur_version, file_version); } - - ASSERT_EQ(SQLITE_OK, sqlite3_close(db)); } namespace { |