chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.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/bookmarks/bookmark_bar_folder_view_unittest.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm

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

index 25da95d3fa11ec852a8607d184a2101c7960a20d..fa886dd4e1051a631472a8344135ac9022a7347d 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm

@@ -15,6 +15,7 @@

#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"

#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"

#import "chrome/browser/ui/cocoa/url_drop_target.h"

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

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

#include "testing/platform_test.h"

#import "third_party/mozilla/NSPasteboard+Utils.h"

@@ -156,7 +157,7 @@ TEST_F(BookmarkBarFolderViewTest, BookmarkButtonDragAndDropAcrossProfiles) {

TestingProfile* other_profile =

testing_profile_manager()->CreateTestingProfile("other");

other_profile->CreateBookmarkModel(true);

- other_profile->BlockUntilBookmarkModelLoaded();

+ ui_test_utils::WaitForBookmarkModelToLoad(other_profile);

mock_controller_.reset(GetMockController(

YES, BookmarkModelFactory::GetForProfile(other_profile)));