Revert 113785 - Enable TransferNavigationResourceHandler

chrome/browser/extensions/app_process_apitest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/process_map.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 343 matching lines @@
   // 3. Renderer issues the meta refresh to navigate to server-redirect.
   // 4. Renderer is now in a "provisional load", waiting for navigation to
   //    complete.
   // 5. Browser sees a redirect response from server-redirect to empty.html, and
   //    transfers that to a new navigation, using RequestTransferURL.
   // 6. We navigate to empty.html.
   // 7. Renderer is still in a provisional load to server-redirect, so that is
   //    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.
   ASSERT_EQ(3, browser()->tab_count());
   EXPECT_EQ("/files/extensions/api_test/app_process/path1/empty.html",
             browser()->GetTabContentsAt(2)->controller().
                 GetLastCommittedEntry()->url().path());
   EXPECT_EQ(browser()->GetTabContentsAt(1)->render_view_host()->process(),
             browser()->GetTabContentsAt(2)->render_view_host()->process());
 }
@@ skipping 225 matching lines @@
       content::Source<NavigationController>(
           &browser()->GetSelectedTabContentsWrapper()->controller()));
   browser()->Reload(CURRENT_TAB);
   observer.Wait();
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       contents->render_view_host(), L"",
       L"window.domAutomationController.send(chrome.app.isInstalled)",
       &is_installed));
   ASSERT_TRUE(is_installed);
 }