diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 12:30:46 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 12:30:46 +0000 |
| commit | 83eff5b89efcffd43855e7cec3681f18cd261704 (patch) | |
| tree | 5ef7f0456834e1b8ecefd8aa62f0a6128e850d89 /chrome/browser/extensions/app_process_apitest.cc | |
| parent | 5aba58b90a60fcd9162abb0c783c968bde020700 (diff) | |
| download | chromium_src-83eff5b89efcffd43855e7cec3681f18cd261704.zip chromium_src-83eff5b89efcffd43855e7cec3681f18cd261704.tar.gz chromium_src-83eff5b89efcffd43855e7cec3681f18cd261704.tar.bz2 | |
Revert 113785 - Enable TransferNavigationResourceHandler
Revert for potential cause of ExtensionApiTest.ProcessesVsTaskManager failure.
This enables a fix for bug 79520 that was previously committed but not enabled http://src.chromium.org/viewvc/chrome?view=rev&revision=112847.
BUG=79520
TEST=no
TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/8889007
TBR=battre@chromium.org
Review URL: http://codereview.chromium.org/8879051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113794 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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 18fadc7..d6bf4d6 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -361,8 +361,13 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcessRedirectBack) { // cancelled, and counts as a load stop // 8. Renderer navigates to empty.html, and finishes loading, counting as the // third load stop +#if defined(TRANSFER_REDIRECTS_BUG79520) ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( browser(), base_url.Resolve("path1/redirect.html"), 3); +#else + ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( + browser(), base_url.Resolve("path1/redirect.html"), 2); +#endif // 3 tabs, including the initial about:blank. The last 2 should be the same // process. |