Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4386)

Unified Diff: chrome/browser/ui/toolbar/action_box_menu_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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/toolbar/action_box_menu_model_unittest.cc
diff --git a/chrome/browser/ui/toolbar/action_box_menu_model_unittest.cc b/chrome/browser/ui/toolbar/action_box_menu_model_unittest.cc
index 56726ba12f304c519713546b4884d7fb940af5e4..79826d12323d93dcc0611de4cbc3bb45a39d5f10 100644
--- a/chrome/browser/ui/toolbar/action_box_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/action_box_menu_model_unittest.cc
@@ -7,8 +7,6 @@
#include "base/prefs/testing_pref_service.h"
#include "base/values.h"
#include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/chrome_to_mobile_service.h"
#include "chrome/browser/chrome_to_mobile_service_factory.h"
#include "chrome/browser/ui/browser.h"
@@ -18,6 +16,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/test/base/browser_with_test_window_test.h"
#include "chrome/test/base/testing_profile.h"
+#include "chrome/test/base/ui_test_utils.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "sync/notifier/invalidation_util.h"
@@ -206,7 +205,7 @@ TEST_F(ActionBoxMenuModelTest, BookmarkedPage) {
true);
// Set up bookmark model
profile()->CreateBookmarkModel(true);
- profile()->BlockUntilBookmarkModelLoaded();
+ ui_test_utils::WaitForBookmarkModelToLoad(profile());
// Navigate to a url.
GURL url1("http://www.google.com");

Powered by Google App Engine
This is Rietveld 408576698