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

Unified Diff: chrome/browser/chromeos/extensions/file_browser_notifications_browsertest.cc

Issue 10825085: Move RunAllPendingInMessageLoop from ui_test_utils.h to test_utils.h, so that it can be reused by c… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 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/chromeos/extensions/file_browser_notifications_browsertest.cc
===================================================================
--- chrome/browser/chromeos/extensions/file_browser_notifications_browsertest.cc (revision 149002)
+++ chrome/browser/chromeos/extensions/file_browser_notifications_browsertest.cc (working copy)
@@ -77,7 +77,7 @@
EXPECT_FALSE(FindNotification("Dpath"));
// Running the message loop should create the notification.
- ui_test_utils::RunAllPendingInMessageLoop();
+ content::RunAllPendingInMessageLoop();
EXPECT_EQ(1u, notifications_->GetNotificationCountForTest());
EXPECT_TRUE(FindNotification("Dpath"));
@@ -93,7 +93,7 @@
// When the delayed notification is processed, it's an update, so we still
// only have two notifications.
- ui_test_utils::RunAllPendingInMessageLoop();
+ content::RunAllPendingInMessageLoop();
EXPECT_EQ(2u, notifications_->GetNotificationCountForTest());
EXPECT_TRUE(FindNotification("DFpath"));
@@ -110,7 +110,7 @@
EXPECT_FALSE(FindNotification("Fpath"));
// Even after processing messages, no new notification should be added.
- ui_test_utils::RunAllPendingInMessageLoop();
+ content::RunAllPendingInMessageLoop();
EXPECT_EQ(2u, notifications_->GetNotificationCountForTest());
EXPECT_TRUE(FindNotification("Dpath"));
EXPECT_TRUE(FindNotification("DFpath"));
@@ -128,7 +128,7 @@
EXPECT_TRUE(FindNotification("Dpath"));
// Running pending messges should remove the notification.
- ui_test_utils::RunAllPendingInMessageLoop();
+ content::RunAllPendingInMessageLoop();
EXPECT_EQ(0u, notifications_->GetNotificationCountForTest());
// Immediate show then hide results in no notification.
@@ -136,14 +136,14 @@
"path");
notifications_->HideNotification(FileBrowserNotifications::DEVICE_FAIL,
"path");
- ui_test_utils::RunAllPendingInMessageLoop();
+ content::RunAllPendingInMessageLoop();
EXPECT_EQ(0u, notifications_->GetNotificationCountForTest());
// Delayed hide for a notification that doesn't exist does nothing.
notifications_->HideNotificationDelayed(FileBrowserNotifications::DEVICE_FAIL,
"path",
base::TimeDelta::FromSeconds(0));
- ui_test_utils::RunAllPendingInMessageLoop();
+ content::RunAllPendingInMessageLoop();
EXPECT_EQ(0u, notifications_->GetNotificationCountForTest());
}
« no previous file with comments | « chrome/browser/browser_keyevents_browsertest.cc ('k') | chrome/browser/chromeos/login/existing_user_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698