PlzNavigate: fix test FrameNavigationEntry_SubframeHistoryFallback

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 629 matching lines @@
   return GetContentClient()->browser()->ShouldAssignSiteForURL(url);
 }
 
 void NavigatorImpl::RequestOpenURL(RenderFrameHostImpl* render_frame_host,
                                    const GURL& url,
                                    SiteInstance* source_site_instance,
                                    const Referrer& referrer,
                                    WindowOpenDisposition disposition,
                                    bool should_replace_current_entry,
                                    bool user_gesture) {
-  // This call only makes sense for subframes if OOPIFs are possible.
+  // This call only makes sense for subframes if OOPIFs are possible, or if
+  // FrameNavigationEntries are being used. The latter case happens when the
+  // history item for a subframe is not found during a history navigation, and
+  // the subframe needs to navigate to the fallback url.
   DCHECK(!render_frame_host->GetParent() ||
-         SiteIsolationPolicy::AreCrossProcessFramesPossible());
+         SiteIsolationPolicy::AreCrossProcessFramesPossible() ||
+         SiteIsolationPolicy::UseSubframeNavigationEntries());

[Charlie Reis, 2016/04/15 17:36:42]

nit: This should just be UseSubframeNavigationEntries(), which will already
return true if AreCrossProcessFramesPossible() (since OOPIFs depend on FNEs).

[clamy, 2016/04/25 11:05:34]

Removed this block due to code change in navigator_impl.

 
   SiteInstance* current_site_instance = render_frame_host->frame_tree_node()
                                             ->current_frame_host()
                                             ->GetSiteInstance();
 
   // 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(
           current_site_instance, url)) {
     dest_url = GURL(url::kAboutBlankURL);
   }
 
   int frame_tree_node_id = -1;
 
   // Send the navigation to the current FrameTreeNode if it's destined for a
   // subframe in the current tab.  We'll assume it's for the main frame
   // (possibly of a new or different WebContents) otherwise.
-  if (SiteIsolationPolicy::AreCrossProcessFramesPossible() &&
+  if ((SiteIsolationPolicy::AreCrossProcessFramesPossible() ||
+       SiteIsolationPolicy::UseSubframeNavigationEntries()) &&

[Charlie Reis, 2016/04/15 17:36:42]

Same.

[clamy, 2016/04/25 11:05:34]

Done.

       disposition == CURRENT_TAB && render_frame_host->GetParent()) {
     frame_tree_node_id =
         render_frame_host->frame_tree_node()->frame_tree_node_id();
   }
 
   OpenURLParams params(dest_url, referrer, frame_tree_node_id, disposition,
                        ui::PAGE_TRANSITION_LINK,
                        true /* is_renderer_initiated */);
   params.source_site_instance = source_site_instance;
   if (redirect_chain.size() > 0)
@@ skipping 416 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