diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 10:35:43 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 10:35:43 +0000 |
| commit | 52d896b54117b5ccc5bf4d4783421b713f5e652e (patch) | |
| tree | d44581fb83bbbe3a12262504948d71de1b5d602d /chrome/browser | |
| parent | b33061331c6c632bd5aa51de7db8b96452bb0299 (diff) | |
| download | chromium_src-52d896b54117b5ccc5bf4d4783421b713f5e652e.zip chromium_src-52d896b54117b5ccc5bf4d4783421b713f5e652e.tar.gz chromium_src-52d896b54117b5ccc5bf4d4783421b713f5e652e.tar.bz2 | |
Enable TransferNavigationResourceHandler
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113785 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/extensions/app_process_apitest.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index d6bf4d6..18fadc7 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -361,13 +361,8 @@ 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. diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc index 58f8e1a..ab72c1b 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc @@ -183,12 +183,8 @@ ResourceHandler* ChromeResourceDispatcherHostDelegate::RequestBeginning( resource_context.appcache_service()); #endif - // TODO(mpcomplete): Leaving disabled for now, since I'm checking this in - // close to the branch point. -#if defined(TRANSFER_REDIRECTS_BUG79520) handler = new TransferNavigationResourceHandler( handler, resource_dispatcher_host_, request); -#endif return handler; } |