diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 00:45:08 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 00:45:08 +0000 |
| commit | c374f8a8e76a04433521653d6184928b7a1a60cf (patch) | |
| tree | 3892cf06bae9a52c0cdbedd4f6a466eb69ab8f41 /chrome/browser/extensions/app_process_apitest.cc | |
| parent | b2689a904862958dc086f109839f86a6424df261 (diff) | |
| download | chromium_src-c374f8a8e76a04433521653d6184928b7a1a60cf.zip chromium_src-c374f8a8e76a04433521653d6184928b7a1a60cf.tar.gz chromium_src-c374f8a8e76a04433521653d6184928b7a1a60cf.tar.bz2 | |
Disable AppApiTest.AppProcessRedirectBack on aura
The test timeouts occasionally on aura.
BUG=105957
TEST=none
Review URL: http://codereview.chromium.org/8760002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112359 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 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 0789c6e..8c89736 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -327,7 +327,13 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_BookmarkAppGetsNormalProcess) { // 3. page2 redirects back to a page in the app // The final navigation should end up in the app process. // See http://crbug.com/61757 -IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessRedirectBack) { +// This test occasionally timeout on aura. See crbug.com/105957. +#if defined(USE_AURA) +#define MAYBE_AppProcessRedirectBack DISABLED_AppProcessRedirectBack +#else +#define MAYBE_AppProcessRedirectBack AppProcessRedirectBack +#endif +IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcessRedirectBack) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kDisablePopupBlocking); |