bookmarks: Wait for bookmark model to load by using WaitForBookmarkModelToLoad() function.

chrome/browser/ui/bookmarks/bookmark_browsertest.cc

 // 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/bind.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ skipping 39 matching lines @@
         FROM_HERE,
         base::TimeDelta::FromMilliseconds(15),
         base::Bind(&CheckAnimation, browser(), runner->QuitClosure()));
     runner->Run();
     return base::Time::Now() - start;
   }
 
   BookmarkModel* WaitForBookmarkModel(Profile* profile) {
     BookmarkModel* bookmark_model =
         BookmarkModelFactory::GetForProfile(profile);
-    if (!bookmark_model->IsLoaded()) {
-      content::WindowedNotificationObserver observer(
-          chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED,
-          content::NotificationService::AllSources());
-      observer.Wait();
-    }
+    ui_test_utils::WaitForBookmarkModelToLoad(bookmark_model);
     return bookmark_model;
   }
 };
 
 // Test of bookmark bar toggling, visibility, and animation.
 IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, BookmarkBarVisibleWait) {
   ASSERT_FALSE(IsVisible());
   chrome::ExecuteCommand(browser(), IDC_SHOW_BOOKMARK_BAR);
   base::TimeDelta delay = WaitForBookmarkBarAnimationToFinish();
   LOG(INFO) << "Took " << delay.InMilliseconds() << " ms to show bookmark bar";
@@ skipping 45 matching lines @@
       bookmark_model1, GURL(kPersistBookmarkURL),
       ASCIIToUTF16(kPersistBookmarkTitle));
   std::vector<BookmarkService::URLAndTitle> urls1, urls2;
   bookmark_model1->GetBookmarks(&urls1);
   bookmark_model2->GetBookmarks(&urls2);
   ASSERT_EQ(1u, urls1.size());
   ASSERT_TRUE(urls2.empty());
 }
 
 #endif