chrome/browser/ui/cocoa/cocoa_profile_test.mm - 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/cocoa/cocoa_profile_test.mm

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:

Index: chrome/browser/ui/cocoa/cocoa_profile_test.mm

diff --git a/chrome/browser/ui/cocoa/cocoa_profile_test.mm b/chrome/browser/ui/cocoa/cocoa_profile_test.mm

index bc3f1dff81c2aecb6038181b08143850b02e1bcc..4d56be37d95d7c60618705d17698e85e3be8f478 100644

--- a/chrome/browser/ui/cocoa/cocoa_profile_test.mm

+++ b/chrome/browser/ui/cocoa/cocoa_profile_test.mm

@@ -12,6 +12,7 @@

#include "chrome/browser/ui/host_desktop.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

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

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

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

using content::BrowserThread;

@@ -61,7 +62,7 @@ void CocoaProfileTest::SetUp() {

ASSERT_TRUE(profile_);

profile_->CreateBookmarkModel(true);

- profile_->BlockUntilBookmarkModelLoaded();

+ ui_test_utils::WaitForBookmarkModelToLoad(profile_);

// TODO(shess): These are needed in case someone creates a browser

// window off of browser_. pkasting indicates that other