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

Unified Diff: chrome/browser/task_manager/task_manager_notification_browsertest.cc

Issue 10882071: Fixes for bunch of browser tests that are trying to load content from file: schema. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 3 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/task_manager/task_manager_notification_browsertest.cc
diff --git a/chrome/browser/task_manager/task_manager_notification_browsertest.cc b/chrome/browser/task_manager/task_manager_notification_browsertest.cc
index 233335f56d1b1d6788f515240b87baa06a203a84..c9d5d52d8fd3ff84210eddcbf7c5dd9fea3695cb 100644
--- a/chrome/browser/task_manager/task_manager_notification_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_notification_browsertest.cc
@@ -46,7 +46,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerNotificationBrowserTest,
// Show the task manager.
browser()->window()->ShowTaskManager();
// Expect to see the browser and the New Tab Page renderer.
- TaskManagerBrowserTestUtil::WaitForResourceChange(2);
+ TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
// Show a notification.
NotificationUIManager* notifications =
@@ -64,13 +64,13 @@ IN_PROC_BROWSER_TEST_F(TaskManagerNotificationBrowserTest,
GURL(), GURL(content), ASCIIToUTF16("Test 2"), string16(), del2.get());
notifications->Add(n1, browser()->profile());
- TaskManagerBrowserTestUtil::WaitForResourceChange(3);
+ TaskManagerBrowserTestUtil::WaitForWebResourceChange(2);
notifications->Add(n2, browser()->profile());
- TaskManagerBrowserTestUtil::WaitForResourceChange(4);
+ TaskManagerBrowserTestUtil::WaitForWebResourceChange(3);
notifications->CancelById(n1.notification_id());
- TaskManagerBrowserTestUtil::WaitForResourceChange(3);
+ TaskManagerBrowserTestUtil::WaitForWebResourceChange(2);
notifications->CancelById(n2.notification_id());
- TaskManagerBrowserTestUtil::WaitForResourceChange(2);
+ TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
}
#endif // !USE_ASH
« no previous file with comments | « chrome/browser/task_manager/task_manager_browsertest_util.cc ('k') | chrome/browser/ui/ash/caps_lock_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698