Update defaults for InstantExtended.

chrome/browser/extensions/app_process_apitest.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/command_line.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
@@ skipping 75 matching lines @@
     ui_test_utils::NavigateToURLWithDisposition(
         browser(), base_url.Resolve("path1/empty.html"), NEW_FOREGROUND_TAB,
         ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
     LOG(INFO) << "Nav 1.";
     EXPECT_TRUE(process_map->Contains(
         browser()->tab_strip_model()->GetWebContentsAt(1)->
             GetRenderProcessHost()->GetID()));
     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();
     LOG(INFO) << "New tab.";
     ui_test_utils::NavigateToURL(browser(),
                                  base_url.Resolve("path2/empty.html"));
     LOG(INFO) << "Nav 2.";
     EXPECT_TRUE(process_map->Contains(
         browser()->tab_strip_model()->GetWebContentsAt(2)->
             GetRenderProcessHost()->GetID()));
@@ skipping 268 matching lines @@
 // See http://crbug.com/61757
 IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessRedirectBack) {
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app_process")));
 
   // 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.
   // 3. Renderer issues the meta refresh to navigate to server-redirect.
   // 4. Renderer is now in a "provisional load", waiting for navigation to
   //    complete.
   // 5. Browser sees a redirect response from server-redirect to empty.html, and
   //    transfers that to a new navigation, using RequestTransferURL.
   // 6. Renderer navigates to empty.html, and finishes loading, counting as the
   //    second load stop
@@ skipping 432 matching lines @@
           &browser()->tab_strip_model()->GetActiveWebContents()->
               GetController()));
   chrome::Reload(browser(), CURRENT_TAB);
   observer.Wait();
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       contents,
       "window.domAutomationController.send(chrome.app.isInstalled)",
       &is_installed));
   ASSERT_TRUE(is_installed);
 }