diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 21:40:00 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 21:40:00 +0000 |
commit | d486a085bd85065f8952d43f20e3f2c622ef7b7a (patch) | |
tree | 6b56ee8893dd1660a3c2ed7a2ecb8a5c8d948441 /chrome/browser/bookmarks | |
parent | 740847d37d057d41ea5956ec0cb123a7dbd5b904 (diff) | |
download | chromium_src-d486a085bd85065f8952d43f20e3f2c622ef7b7a.zip chromium_src-d486a085bd85065f8952d43f20e3f2c622ef7b7a.tar.gz chromium_src-d486a085bd85065f8952d43f20e3f2c622ef7b7a.tar.bz2 |
Unittest for fix to allow navigation when there is no history DB.
BUG=25822
TEST=none
Review URL: http://codereview.chromium.org/343067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30744 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
-rw-r--r-- | chrome/browser/bookmarks/bookmark_index_unittest.cc | 2 | ||||
-rw-r--r-- | chrome/browser/bookmarks/bookmark_model_unittest.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/bookmarks/bookmark_index_unittest.cc b/chrome/browser/bookmarks/bookmark_index_unittest.cc index 9ef6907..cbc941e 100644 --- a/chrome/browser/bookmarks/bookmark_index_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_index_unittest.cc @@ -217,7 +217,7 @@ TEST_F(BookmarkIndexTest, GetResultsSortedByTypedCount) { ChromeThread file_thread(ChromeThread::FILE, &loop); TestingProfile profile; - profile.CreateHistoryService(true); + profile.CreateHistoryService(true, false); profile.BlockUntilHistoryProcessesPendingRequests(); profile.CreateBookmarkModel(true); profile.BlockUntilBookmarkModelLoaded(); diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc index d511530..1e5b90e 100644 --- a/chrome/browser/bookmarks/bookmark_model_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc @@ -619,7 +619,7 @@ class BookmarkModelTestWithProfile : public testing::Test, // Need to shutdown the old one before creating a new one. profile_.reset(NULL); profile_.reset(new TestingProfile()); - profile_->CreateHistoryService(true); + profile_->CreateHistoryService(true, false); } BookmarkModel* bb_model_; @@ -685,7 +685,7 @@ TEST_F(BookmarkModelTestWithProfile, CreateAndRestore) { profile_.reset(NULL); profile_.reset(new TestingProfile()); profile_->CreateBookmarkModel(true); - profile_->CreateHistoryService(true); + profile_->CreateHistoryService(true, false); BlockTillBookmarkModelLoaded(); TestNode bbn; @@ -818,7 +818,7 @@ TEST_F(BookmarkModelTestWithProfile2, MigrateFromDBToFileTest) { // Create the history service making sure it doesn't blow away the file we // just copied. - profile_->CreateHistoryService(false); + profile_->CreateHistoryService(false, false); profile_->CreateBookmarkModel(true); BlockTillBookmarkModelLoaded(); @@ -847,7 +847,7 @@ TEST_F(BookmarkModelTestWithProfile2, MigrateFromDBToFileTest) { // Recreate the history service (with a clean db). Do this just to make sure // we're loading correctly from the bookmarks file. - profile_->CreateHistoryService(true); + profile_->CreateHistoryService(true, false); profile_->CreateBookmarkModel(false); BlockTillBookmarkModelLoaded(); VerifyExpectedState(); @@ -857,7 +857,7 @@ TEST_F(BookmarkModelTestWithProfile2, MigrateFromDBToFileTest) { // Simple test that removes a bookmark. This test exercises the code paths in // History that block till bookmark bar model is loaded. TEST_F(BookmarkModelTestWithProfile2, RemoveNotification) { - profile_->CreateHistoryService(false); + profile_->CreateHistoryService(false, false); profile_->CreateBookmarkModel(true); BlockTillBookmarkModelLoaded(); |