bookmarks: Get rid of TestingProfile::BlockUntilBookmarkModelLoaded().

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
 #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"
 
 namespace {
 // Some values used for mocks and fakes.
 const CGFloat kFakeIndicatorPos = 7.0;
 const NSPoint kPoint = {10, 10};
 };
 
@@ skipping 215 matching lines @@
 TEST_F(BookmarkBarViewTest, BookmarkButtonDragAndDropAcrossProfiles) {
   scoped_nsobject<FakeBookmarkDraggingInfo>
   info([[FakeBookmarkDraggingInfo alloc] init]);
   [view_ setController:info.get()];
   [info reset];
 
   // |other_profile| is owned by the |testing_profile_manager|.
   TestingProfile* other_profile =
       testing_profile_manager()->CreateTestingProfile("other");
   other_profile->CreateBookmarkModel(true);
-  other_profile->BlockUntilBookmarkModelLoaded();
 
   BookmarkModel* bookmark_model =
       BookmarkModelFactory::GetForProfile(profile());
+  ui_test_utils::WaitForBookmarkModelToLoad(bookmark_model);
+
   const BookmarkNode* node =
       bookmark_model->AddURL(bookmark_model->bookmark_bar_node(),
                              0,
                              ASCIIToUTF16("Test Bookmark"),
                              GURL("http://www.exmaple.com"));
 
   scoped_nsobject<BookmarkButtonCell> button_cell(
       [[BookmarkButtonCell buttonCellForNode:node
                                         text:nil
                                        image:nil
@@ skipping 44 matching lines @@
   EXPECT_TRUE([info draggingEnteredCalled]);  // Ensure controller pinged.
   EXPECT_TRUE([view_ dropIndicatorShown]);
   EXPECT_EQ([view_ dropIndicatorPosition], kFakeIndicatorPos);
 
   [info setDropIndicatorShown:NO];
   EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove);
   EXPECT_FALSE([view_ dropIndicatorShown]);
 }
 
 }  // namespace