diff options
| author | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 21:02:10 +0000 |
|---|---|---|
| committer | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 21:02:10 +0000 |
| commit | 1153596a4543e779244f410b2ecf804d9c8c54e9 (patch) | |
| tree | d12cfcc07c0939195684c8aee4297f929be57f50 /chrome/browser/extensions/app_process_apitest.cc | |
| parent | 70134908a747e15559ce8ea951312bf126cea38e (diff) | |
| download | chromium_src-1153596a4543e779244f410b2ecf804d9c8c54e9.zip chromium_src-1153596a4543e779244f410b2ecf804d9c8c54e9.tar.gz chromium_src-1153596a4543e779244f410b2ecf804d9c8c54e9.tar.bz2 | |
Fixing the proper reload type in the navigation controller when reloading cross-process.
BUG=80621,112597
TEST=Run the ReloadIntoAppProcess test in browser_tests on machine with big resource load.
Review URL: http://codereview.chromium.org/9359018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121283 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 | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 7ea46aa..7f67045 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -387,14 +387,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcessRedirectBack) { // Ensure that reloading a URL after installing or uninstalling it as an app // correctly swaps the process. (http://crbug.com/80621) -// -// Flaky on Mac: http://crbug.com/112597 -#if defined(OS_MAC) -#define MAYBE_ReloadIntoAppProcess FLAKY_ReloadIntoAppProcess -#else -#define MAYBE_ReloadIntoAppProcess ReloadIntoAppProcess -#endif -IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcess) { +IN_PROC_BROWSER_TEST_F(AppApiTest, ReloadIntoAppProcess) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kDisablePopupBlocking); |