chrome/browser/ui/bookmarks/bookmark_context_menu_controller_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/ui/bookmarks/bookmark_context_menu_controller_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/sync/profile_sync_service_bookmark_unittest.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc

diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc

index 110b67df7bfc5ae6cd7fbb6ef249f629a8b8c32f..6f12a6e3c2f1900761b6cdc20e88d1cbdff58daf 100644

--- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc

+++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc

@@ -14,6 +14,7 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/bookmarks/bookmark_utils.h"

#include "chrome/test/base/testing_profile.h"

+#include "chrome/test/base/ui_test_utils.h"

#include "content/public/browser/page_navigator.h"

#include "content/public/test/test_browser_thread.h"

#include "grit/generated_resources.h"

@@ -47,9 +48,9 @@ class BookmarkContextMenuControllerTest : public testing::Test {

virtual void SetUp() OVERRIDE {

profile_.reset(new TestingProfile());

profile_->CreateBookmarkModel(true);

- profile_->BlockUntilBookmarkModelLoaded();

model_ = BookmarkModelFactory::GetForProfile(profile_.get());

+ ui_test_utils::WaitForBookmarkModelToLoad(model_);

AddTestData();

}