Introduce RenderFrameProxyHost object and use it in RFHM.

content/browser/frame_host/render_frame_host_impl.h

Index: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index f3130667b797d9671b33d37b0bfef3f1385c96df..c19e8bf4dc31e3000a74ed52db1a4759428c1505 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -137,6 +137,10 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost {
   bool is_swapped_out() { return is_swapped_out_; }
   void set_swapped_out(bool is_swapped_out) {
     is_swapped_out_ = is_swapped_out;
+    created_for_pending_ = false;
+  }
+  bool is_created_for_pending() {
+    return created_for_pending_;
   }
 
   // Sets the RVH for |this| as pending shutdown. |on_swap_out| will be called
@@ -252,6 +256,13 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost {
   int routing_id_;
   bool is_swapped_out_;
 
+  // This boolean indicates whether this RenderFrameHostImpl was created as a
+  // pending RFH in cross-site navigation. Once it has swapped out once,
+  // the value is set to false for the lifetime of the object.
+  // TODO(nasko): This is a nasty hack which should be removed once we can
+  // properly transition RenderFrameHost to RenderFrameProxyHost and vice versa.
+  bool created_for_pending_;

[Charlie Reis, 2014/03/31 23:22:35]

What was wrong with the active_view_count hack?  It'd be really nice to avoid
adding this if possible.

[nasko, 2014/04/09 17:52:01]

Done.

+
   // When the last BeforeUnload message was sent.
   base::TimeTicks send_before_unload_start_time_;