Revert 132407 - Fixing a problem, where a hung renderer process is not killed when navigating away

content/browser/renderer_host/resource_dispatcher_host_impl.cc

 // Copyright (c) 2012 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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
 
 #include <set>
 #include <vector>
@@ skipping 270 matching lines @@
     case ResourceType::PRERENDER:
       return net::IDLE;
 
     default:
       // When new resource types are added, their priority must be considered.
       NOTREACHED();
       return net::LOW;
   }
 }
 
-void OnSwapOutACKHelper(int render_process_id,
-                        int render_view_id,
-                        bool timed_out) {
+void OnSwapOutACKHelper(int render_process_id, int render_view_id) {
   RenderViewHostImpl* rvh = RenderViewHostImpl::FromID(render_process_id,
                                                        render_view_id);
   if (rvh)
-    rvh->OnSwapOutACK(timed_out);
+    rvh->OnSwapOutACK();
 }
 
 net::Error CallbackAndReturn(
     const DownloadResourceHandler::OnStartedCallback& started_cb,
     net::Error net_error) {
   if (started_cb.is_null())
     return net_error;
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(started_cb, content::DownloadId::Invalid(), net_error));
@@ skipping 785 matching lines @@
       ResourceType::SUB_RESOURCE,
       PAGE_TRANSITION_LINK,
       0,         // upload_size
       download,  // is_download
       download,  // allow_download
       false,     // has_user_gesture
       WebKit::WebReferrerPolicyDefault,
       context);
 }
 
-
 void ResourceDispatcherHostImpl::OnSwapOutACK(
-  const ViewMsg_SwapOut_Params& params) {
-  HandleSwapOutACK(params, false);
-}
-
-void ResourceDispatcherHostImpl::OnSimulateSwapOutACK(
     const ViewMsg_SwapOut_Params& params) {
-  // Call the real implementation with true, which means that we timed out.
-  HandleSwapOutACK(params, true);
-}
-
-void ResourceDispatcherHostImpl::HandleSwapOutACK(
-    const ViewMsg_SwapOut_Params& params, bool timed_out) {
   // Closes for cross-site transitions are handled such that the cross-site
   // transition continues.
   GlobalRequestID global_id(params.new_render_process_host_id,
                             params.new_request_id);
   PendingRequestList::iterator i = pending_requests_.find(global_id);
   if (i != pending_requests_.end()) {
     // The response we were meant to resume could have already been canceled.
     ResourceRequestInfoImpl* info =
         ResourceRequestInfoImpl::ForRequest(i->second);
     if (info->cross_site_handler())
       info->cross_site_handler()->ResumeResponse();
   }
   // Update the RenderViewHost's internal state after the ACK.
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&OnSwapOutACKHelper,
                  params.closing_process_id,
-                 params.closing_route_id,
-                 timed_out));
+                 params.closing_route_id));
 }
 
 void ResourceDispatcherHostImpl::OnDidLoadResourceFromMemoryCache(
     const GURL& url,
     const std::string& security_info,
     const std::string& http_method,
     ResourceType::Type resource_type) {
   if (!url.is_valid() || !(url.SchemeIs("http") || url.SchemeIs("https")))
     return;
 
@@ skipping 1189 matching lines @@
   return allow_cross_origin_auth_prompt_;
 }
 
 bool ResourceDispatcherHostImpl::IsTransferredNavigation(
     const GlobalRequestID& transferred_request_id) const {
   return transferred_navigations_.find(transferred_request_id) !=
       transferred_navigations_.end();
 }
 
 }  // namespace content