Revert "Revert 249676 "Have the unload event execute in background on cr...""

content/test/test_render_view_host.h

Index: content/test/test_render_view_host.h
diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h
index cf963e4e5ea5a72e19b6479f3c936bc4bd32bfc7..985b4d96c8cbf9227d00e156b88cce6079b37c53 100644
--- a/content/test/test_render_view_host.h
+++ b/content/test/test_render_view_host.h
@@ -285,16 +285,10 @@ class TestRenderViewHost
     return is_waiting_for_beforeunload_ack_;
   }
 
-  // Returns whether the RenderViewHost is currently waiting to hear the result
-  // of an unload handler from the renderer.
-  bool is_waiting_for_unload_ack() const {
-    return is_waiting_for_unload_ack_;
-  }
-
   // Sets whether the RenderViewHost is currently swapped out, and thus
   // filtering messages from the renderer.
-  void set_is_swapped_out(bool is_swapped_out) {
-    is_swapped_out_ = is_swapped_out;
+  void set_rvh_state(RenderViewHostImplState rvh_state) {
+    rvh_state_ = rvh_state;
   }
 
   // If set, navigations will appear to have loaded through a proxy