diff options
| author | samarth@chromium.org <samarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 22:04:07 +0000 |
|---|---|---|
| committer | samarth@chromium.org <samarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 22:04:07 +0000 |
| commit | 14ac41ff40ef4eb1c9369ac2fe590f67336084fe (patch) | |
| tree | 464d284b09b8ef3333e8818651ba383ba0d467e0 /chrome/browser/extensions/app_process_apitest.cc | |
| parent | f47062588876c7a4db0e99311f0fd9e1b8c12a0e (diff) | |
| download | chromium_src-14ac41ff40ef4eb1c9369ac2fe590f67336084fe.zip chromium_src-14ac41ff40ef4eb1c9369ac2fe590f67336084fe.tar.gz chromium_src-14ac41ff40ef4eb1c9369ac2fe590f67336084fe.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/app_process_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/app_process_apitest.cc | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 26308a6..19a3e79 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(); @@ -282,13 +282,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcessBackgroundInstances) { // 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. 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) { +// Timing out on Windows. Flaky on other platforms. http://crbug.com/238777 +IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_BookmarkAppGetsNormalProcess) { ExtensionService* service = extensions::ExtensionSystem::Get( browser()->profile())->extension_service(); extensions::ProcessMap* process_map = service->process_map(); @@ -382,9 +377,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. |