Revert 228779 "Update defaults for InstantExtended."
Introduces crashes on the mac tests: http://build.chromium.org/p/chromium.mac/builders/Mac%2010.6%20Tests%20%28dbg%29%284%29/builds/34018/steps/unit_tests/logs/stdio
Specifically, these tests now crash:
TabStripControllerTest.TabCloseDuringDrag
TabposeWindowTest.TestModelObserver
TabposeWindowTest.TestShow
And this test suite is referenced in this patch.
> Update defaults for InstantExtended.
>
> Flip the InstantExtended New Tab page to on by default and remove the flags.
> Add a separate flag to control query in the omnibox (which is still off by
> default).
>
> Also fixes a ton of tests that needed adjusting for Instant Extended. Mostly
> the changes stem from the fact that we're prerendering the Instant Extended
> New Tab page which changes assumptions in a bunch of tests.
>
> BUG=297915
>
> Review URL: https://codereview.chromium.org/24733003
[email protected]
Review URL: https://codereview.chromium.org/27235010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228794 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index 19a3e79..26308a6a 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -93,7 +93,7 @@
EXPECT_FALSE(browser()->tab_strip_model()->GetWebContentsAt(1)->GetWebUI());
content::WindowedNotificationObserver tab_added_observer(
- content::NOTIFICATION_LOAD_STOP,
+ chrome::NOTIFICATION_TAB_ADDED,
content::NotificationService::AllSources());
chrome::NewTab(browser());
tab_added_observer.Wait();
@@ -282,8 +282,13 @@
// Tests that bookmark apps do not use the app process model and are treated
// like normal web pages instead. http://crbug.com/104636.
-// Timing out on Windows. Flaky on other platforms. http://crbug.com/238777
-IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_BookmarkAppGetsNormalProcess) {
+// Timing out on Windows. http://crbug.com/238777
+#if defined(OS_WIN)
+#define MAYBE_BookmarkAppGetsNormalProcess DISABLED_BookmarkAppGetsNormalProcess
+#else
+#define MAYBE_BookmarkAppGetsNormalProcess BookmarkAppGetsNormalProcess
+#endif
+IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_BookmarkAppGetsNormalProcess) {
ExtensionService* service = extensions::ExtensionSystem::Get(
browser()->profile())->extension_service();
extensions::ProcessMap* process_map = service->process_map();
@@ -377,18 +382,9 @@
// 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.
