chrome/browser/bookmarks/bookmark_model_unittest.cc - Issue 19616004: Add asserts to TestingProfile::CreateHistoryService to ensure files are deleted

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/bookmarks/bookmark_model_unittest.cc

Issue 19616004: Add asserts to TestingProfile::CreateHistoryService to ensure files are deleted (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix release unit tests Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/bookmarks/bookmark_index_unittest.cc ('k') | chrome/browser/browsing_data/browsing_data_remover_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/bookmarks/bookmark_model_unittest.cc

diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc

index 06610d715c6c3f94f54829fdbef50248866c0e97..65f5c65d756abe9153a75b7d0b81ac504bd0974c 100644

--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc

+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc

@@ -910,15 +910,6 @@ class BookmarkModelTestWithProfile : public testing::Test {

ui_test_utils::WaitForBookmarkModelToLoad(bb_model_);

}

- // Destroys the current profile, creates a new one and creates the history

- // service.

- void RecreateProfile() {

- // Need to shutdown the old one before creating a new one.

- profile_.reset(NULL);

- profile_.reset(new TestingProfile());

- profile_->CreateHistoryService(true, false);

- }

// The profile.

scoped_ptr<TestingProfile> profile_;

BookmarkModel* bb_model_;

@@ -954,7 +945,7 @@ TEST_F(BookmarkModelTestWithProfile, CreateAndRestore) {

profile_.reset(NULL);

profile_.reset(new TestingProfile());

profile_->CreateBookmarkModel(true);

- profile_->CreateHistoryService(true, false);

+ ASSERT_TRUE(profile_->CreateHistoryService(true, false));

BlockTillBookmarkModelLoaded();

TestNode bbn;