chrome/browser/bookmarks/bookmark_model_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/bookmarks/bookmark_model_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:

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 0c622f0ebcf6c741c2f2c3667988048d11b4892a..212c06c819fd25f2c51d1459773d3d7a97d8257c 100644

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

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

@@ -28,6 +28,7 @@

#include "chrome/browser/history/history_service_factory.h"

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

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

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

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

#include "googleurl/src/gurl.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -842,7 +843,7 @@ class BookmarkModelTestWithProfile : public testing::Test {

void BlockTillBookmarkModelLoaded() {

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

- profile_->BlockUntilBookmarkModelLoaded();

+ ui_test_utils::WaitForBookmarkModelToLoad(bb_model_);

}

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