chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc - Issue 12929016: bookmarks: Get rid of TestingProfile::BlockUntilBookmarkModelLoaded().

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/history/android/bookmark_model_sql_handler_unittest.cc

Issue 12929016: bookmarks: Get rid of TestingProfile::BlockUntilBookmarkModelLoaded(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix win Created 7 years, 9 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/history/android/android_provider_backend_unittest.cc ('k') | chrome/browser/history/android/sqlite_cursor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc

diff --git a/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc b/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc

index 84a80a3d46016b5ffe3b0a6e72064d229eb16cea..bbcc1e372c241188c79d3e3b62a30a04a028f455 100644

--- a/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc

+++ b/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc

@@ -46,13 +46,13 @@ class BookmarkModelSQLHandlerTest : public testing::Test {

chrome::kInitialProfile);

// Create the BookmarkModel that doesn't need to invoke load().

testing_profile->CreateBookmarkModel(true);

- testing_profile->BlockUntilBookmarkModelLoaded();

+ bookmark_model_ = BookmarkModelFactory::GetForProfile(testing_profile);

+ ui_test_utils::WaitForBookmarkModelToLoad(bookmark_model_);

+ ASSERT_TRUE(bookmark_model_);

// Get the BookmarkModel from LastUsedProfile, this is the same way that

// how the BookmarkModelSQLHandler gets the BookmarkModel.

Profile* profile = ProfileManager::GetLastUsedProfile();

ASSERT_TRUE(profile);

- bookmark_model_ = BookmarkModelFactory::GetForProfile(profile);

- ASSERT_TRUE(bookmark_model_);

// Create the directory for history database.

ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());