Remove swapped out state from RenderFrameHost.

content/browser/frame_host/navigator_impl.cc

 // 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.
 
 #include "content/browser/frame_host/navigator_impl.h"
 
 #include <utility>
 
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
@@ skipping 601 matching lines @@
                                    bool user_gesture) {
   // This call only makes sense for subframes if OOPIFs are possible.
   DCHECK(!render_frame_host->GetParent() ||
          SiteIsolationPolicy::AreCrossProcessFramesPossible());
 
   // If this came from a swapped out RenderFrameHost, we only allow the request
   // if we are still in the same BrowsingInstance.
   SiteInstance* current_site_instance = render_frame_host->frame_tree_node()
                                             ->current_frame_host()
                                             ->GetSiteInstance();
-  if (render_frame_host->is_swapped_out() &&
-      !render_frame_host->GetSiteInstance()->IsRelatedSiteInstance(
+  if (!render_frame_host->GetSiteInstance()->IsRelatedSiteInstance(

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

This looks wrong.  Before this block was unreachable because is_swapped_out()
was always false.  Now we can get to it.  Should we be removing the block
instead?

Alternatively, if this is a check that makes sense to have, we should update the
comment above it.  (I'm not sure off the top of my head if we do this
BrowsingInstance check sufficiently elsewhere.)

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

Ah, good point. We don't need the check overall, as if a RenderFrameHost is
getting this message, it must be alive or about to be deleted. If it is in the
process of swapping out, I think we still need to allow the call to go through
to keep it equivalent. 

           current_site_instance)) {
     return;
   }
 
   // TODO(creis): Pass the redirect_chain into this method to support client
   // redirects.  http://crbug.com/311721.
   std::vector<GURL> redirect_chain;
 
   GURL dest_url(url);
   if (!GetContentClient()->browser()->ShouldAllowOpenURL(
@@ skipping 487 matching lines @@
   if (pending_entry != controller_->GetVisibleEntry() ||
       !should_preserve_entry) {
     controller_->DiscardPendingEntry(true);
 
     // Also force the UI to refresh.
     controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL);
   }
 }
 
 }  // namespace content