Merge 79440 - Clean up unload-related state after the ack is received.

content/browser/renderer_host/resource_dispatcher_host.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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 
 #include <set>
 #include <vector>
@@ skipping 651 matching lines @@
     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.
       ResourceDispatcherHostRequestInfo* info = InfoForRequest(i->second);
       if (info->cross_site_handler())
         info->cross_site_handler()->ResumeResponse();
     }
   } else {
-    // This is a tab close, so just forward the message to close it.
+    // This is a tab close, so we will close the tab in OnClosePageACK.
     DCHECK(params.new_render_process_host_id == -1);
     DCHECK(params.new_request_id == -1);
-    CallRenderViewHost(params.closing_process_id,
-                       params.closing_route_id,
-                       &RenderViewHost::ClosePageIgnoringUnloadEvents);
   }
+  // Update the RenderViewHost's internal state after the ACK.
+  CallRenderViewHost(params.closing_process_id,
+                     params.closing_route_id,
+                     &RenderViewHost::OnClosePageACK,
+                     params.for_cross_site_transition);
 }
 
 // We are explicitly forcing the download of 'url'.
 void ResourceDispatcherHost::BeginDownload(
     const GURL& url,
     const GURL& referrer,
     const DownloadSaveInfo& save_info,
     bool prompt_for_save_location,
     int child_id,
     int route_id,
@@ skipping 1265 matching lines @@
   return is_prefetch_enabled_;
 }
 
 // static
 void ResourceDispatcherHost::set_is_prefetch_enabled(bool value) {
   is_prefetch_enabled_ = value;
 }
 
 // static
 bool ResourceDispatcherHost::is_prefetch_enabled_ = false;