Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2988)

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.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
Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
index 8d93b0b2b9cd48eb18c6b2fe0621a85b863d8866..2db560576915544dc5f0ba01578f7dfa66f6acde 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -115,7 +115,8 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase {
profile_.reset(new TestingProfile());
profile_->CreateBookmarkModel(true);
- profile_->BlockUntilBookmarkModelLoaded();
+ model_ = BookmarkModelFactory::GetForProfile(profile_.get());
+ ui_test_utils::WaitForBookmarkModelToLoad(model_);
profile_->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, true);
Browser::CreateParams native_params(profile_.get(),
@@ -123,7 +124,6 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase {
browser_.reset(
chrome::CreateBrowserWithTestWindowForParams(&native_params));
- model_ = BookmarkModelFactory::GetForProfile(profile_.get());
model_->ClearStore();
bb_view_.reset(new BookmarkBarView(browser_.get(), NULL));

Powered by Google App Engine
This is Rietveld 408576698