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

Unified Diff: chrome/browser/extensions/app_process_apitest.cc

Issue 24733003: Update defaults for InstantExtended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test exclusion. Created 7 years, 2 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/extensions/app_process_apitest.cc
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index 380ba1ce4610b6b991d4d0bfa735ab7636321b38..07d8d843b05a4e81e7c6a3c9eb7a68d86f6db587 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -93,7 +93,7 @@ class AppApiTest : public ExtensionApiTest {
EXPECT_FALSE(browser()->tab_strip_model()->GetWebContentsAt(1)->GetWebUI());
content::WindowedNotificationObserver tab_added_observer(
- chrome::NOTIFICATION_TAB_ADDED,
+ content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
chrome::NewTab(browser());
tab_added_observer.Wait();
@@ -382,9 +382,18 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessRedirectBack) {
// Open two tabs in the app.
GURL base_url = GetTestBaseURL("app_process");
+ content::WindowedNotificationObserver tab_added_observer(
+ content::NOTIFICATION_LOAD_STOP,
+ content::NotificationService::AllSources());
chrome::NewTab(browser());
+ tab_added_observer.Wait();
ui_test_utils::NavigateToURL(browser(), base_url.Resolve("path1/empty.html"));
+
+ content::WindowedNotificationObserver tab_added_observer2(
+ content::NOTIFICATION_LOAD_STOP,
+ content::NotificationService::AllSources());
chrome::NewTab(browser());
+ tab_added_observer2.Wait();
// Wait until the second tab finishes its redirect train (2 hops).
// 1. We navigate to redirect.html
// 2. Renderer navigates and finishes, counting as a load stop.

Powered by Google App Engine
This is Rietveld 408576698