Remove swapped out state from RenderFrameHost.

content/browser/frame_host/render_frame_host_impl.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 73 matching lines @@
 class StreamHandle;
 class TimeoutMonitor;
 struct ContextMenuParams;
 struct GlobalRequestID;
 struct Referrer;
 struct ResourceResponse;
 
 // Flag arguments for RenderFrameHost creation.
 enum CreateRenderFrameFlags {
   // The RFH will be initially placed on the swapped out hosts list.
   CREATE_RF_SWAPPED_OUT = 1 << 0,

[Charlie Reis, 2016/03/14 20:12:57]

This can be removed now, right?  That would make the change to RFHI's
constructor easier to reason about.  (It looks unused in codesearch.)

[nasko, 2016/03/14 21:32:30]

It is already done in a separate CL -
https://codereview.chromium.org/1801783003/. It will go away once I rebase this
one.

   // The RenderFrame is initially hidden.
   CREATE_RF_HIDDEN = 1 << 1,
 };
 
 class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost,
                                            public BrowserAccessibilityDelegate,
                                            public SiteInstanceImpl::Observer {
  public:
   using AXTreeSnapshotCallback =
       base::Callback<void(
           const ui::AXTreeUpdate&)>;
 
   // Keeps track of the state of the RenderFrameHostImpl, particularly with
   // respect to swap out.
   enum RenderFrameHostImplState {
     // The standard state for a RFH handling the communication with an active
     // RenderFrame.
     STATE_DEFAULT = 0,
     // The RFH has not received the SwapOutACK yet, but the new page has
     // committed in a different RFH.  Upon reception of the SwapOutACK, the RFH
     // will either enter STATE_SWAPPED_OUT (if it is a main frame and there are
     // other active frames in its SiteInstance) or it will be deleted.

[Charlie Reis, 2016/03/14 20:12:57]

Let's update this comment, too.

(Maybe sometime we can make this a bool rather than a state enum, but no rush
for that.)

[nasko, 2016/03/14 21:32:30]

Yeah, I'd convert this to boolean separately.

     STATE_PENDING_SWAP_OUT,
-    // The RFH is swapped out and stored inside a RenderFrameProxyHost, being
-    // used as a placeholder to allow cross-process communication.  Only main
-    // frames can enter this state.
-    STATE_SWAPPED_OUT,
   };
   // Helper function to determine whether the RFH state should contribute to the
   // number of active frames of a SiteInstance or not.
   static bool IsRFHStateActive(RenderFrameHostImplState rfh_state);
 
   // An accessibility reset is only allowed to prevent very rare corner cases
   // or race conditions where the browser and renderer get out of sync. If
   // this happens more than this many times, kill the renderer.
   static const int kMaxAccessibilityResets = 5;
 
@@ skipping 223 matching lines @@
     return is_waiting_for_beforeunload_ack_;
   }
 
   // Whether the RFH is waiting for an unload ACK from the renderer.
   bool IsWaitingForUnloadACK() const;
 
   // Called when either the SwapOut request has been acknowledged or has timed
   // out.
   void OnSwappedOut();
 
-  // Whether this RenderFrameHost has been swapped out, such that the frame is
-  // now rendered by a RenderFrameHost in a different process.
-  bool is_swapped_out() const { return rfh_state_ == STATE_SWAPPED_OUT; }
-
   // The current state of this RFH.
   RenderFrameHostImplState rfh_state() const { return rfh_state_; }
 
   // Sends the given navigation message. Use this rather than sending it
   // yourself since this does the internal bookkeeping described below. This
   // function takes ownership of the provided message pointer.
   //
   // If a cross-site request is in progress, we may be suspended while waiting
   // for the onbeforeunload handler, so this function might buffer the message
   // rather than sending it.
@@ skipping 565 matching lines @@
 
   // NOTE: This must be the last member.
   base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_