Eliminate SwapOut message parameters, keeping state in RVHM instead.

content/browser/renderer_host/render_widget_helper.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.
 
 #include "content/browser/renderer_host/render_widget_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/posix/eintr_wrapper.h"
@@ skipping 109 matching lines @@
 
 // static
 RenderWidgetHelper* RenderWidgetHelper::FromProcessHostID(
     int render_process_host_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   WidgetHelperMap::const_iterator ci = g_widget_helpers.Get().find(
       render_process_host_id);
   return (ci == g_widget_helpers.Get().end())? NULL : ci->second;
 }
 
-void RenderWidgetHelper::SimulateSwapOutACK(
-    const ViewMsg_SwapOut_Params& params) {
+void RenderWidgetHelper::ResumeDeferredNavigation(
+    const GlobalRequestID& request_id) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      base::Bind(&RenderWidgetHelper::OnSimulateSwapOutACK,
+      base::Bind(&RenderWidgetHelper::OnResumeDeferredNavigation,
                  this,
-                 params));
+                 request_id));
 }
 
 bool RenderWidgetHelper::WaitForBackingStoreMsg(
     int render_widget_id, const base::TimeDelta& max_delay, IPC::Message* msg) {
   base::TimeTicks time_start = base::TimeTicks::Now();
 
   for (;;) {
     BackingStoreMsgProxy* proxy = NULL;
     {
       base::AutoLock lock(pending_paints_lock_);
@@ skipping 86 matching lines @@
 void RenderWidgetHelper::OnDispatchBackingStoreMsg(
     BackingStoreMsgProxy* proxy) {
   OnDiscardBackingStoreMsg(proxy);
 
   // It is reasonable for the host to no longer exist.
   RenderProcessHost* host = RenderProcessHost::FromID(render_process_id_);
   if (host)
     host->OnMessageReceived(proxy->message());
 }
 
-void RenderWidgetHelper::OnSimulateSwapOutACK(
-    const ViewMsg_SwapOut_Params& params) {
-  resource_dispatcher_host_->OnSimulateSwapOutACK(params);
+void RenderWidgetHelper::OnResumeDeferredNavigation(
+    const GlobalRequestID& request_id) {
+  resource_dispatcher_host_->ResumeDeferredNavigation(request_id);
 }
 
 void RenderWidgetHelper::CreateNewWindow(
     const ViewHostMsg_CreateWindow_Params& params,
     bool no_javascript_access,
     base::ProcessHandle render_process,
     int* route_id,
     int* main_frame_route_id,
     int* surface_id,
     SessionStorageNamespace* session_storage_namespace) {
@@ skipping 138 matching lines @@
        i = allocated_dibs_.begin(); i != allocated_dibs_.end(); ++i) {
     if (HANDLE_EINTR(close(i->second)) < 0)
       PLOG(ERROR) << "close: " << i->first;
   }
 
   allocated_dibs_.clear();
 }
 #endif
 
 }  // namespace content