PlzNavigate: improve tracking of improper subframe swap-out.

content/browser/frame_host/navigation_controller_impl_unittest.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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
@@ skipping 203 matching lines @@
   }
 
   NavigationControllerImpl& controller_impl() {
     return static_cast<NavigationControllerImpl&>(controller());
   }
 
   bool HasNavigationRequest() {
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kEnableBrowserSideNavigation)) {
       FrameTreeNode* root = contents()->GetFrameTree()->root();
-      NavigationRequest* navigation_request = static_cast<NavigatorImpl*>(
-          root->navigator())->GetNavigationRequestForNodeForTesting(root);
+      NavigationRequest* navigation_request =
+          static_cast<NavigatorImpl*>(root->navigator())
+              ->GetNavigationRequestForNodeForTesting(
+                  root->frame_tree_node_id());
       return navigation_request != nullptr;
     }
     return process()->sink().GetFirstMessageMatching(FrameMsg_Navigate::ID)
         != nullptr;
   }
 
   const GURL GetLastNavigationURL() {
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kEnableBrowserSideNavigation)) {
       FrameTreeNode* root = contents()->GetFrameTree()->root();
-      NavigationRequest* navigation_request = static_cast<NavigatorImpl*>(
-          root->navigator())->GetNavigationRequestForNodeForTesting(root);
+      NavigationRequest* navigation_request =
+          static_cast<NavigatorImpl*>(root->navigator())
+              ->GetNavigationRequestForNodeForTesting(
+                  root->frame_tree_node_id());
       CHECK(navigation_request);
       return navigation_request->common_params().url;
     }
     const IPC::Message* message =
       process()->sink().GetFirstMessageMatching(FrameMsg_Navigate::ID);
     CHECK(message);
     Tuple<CommonNavigationParams, StartNavigationParams,
           RequestNavigationParams> nav_params;
     FrameMsg_Navigate::Read(message, &nav_params);
     return get<0>(nav_params).url;
@@ skipping 4345 matching lines @@
   {
     LoadCommittedDetails details;
     controller_impl().RendererDidNavigate(main_test_rfh(), params, &details);
     EXPECT_EQ(PAGE_TYPE_ERROR,
               controller_impl().GetLastCommittedEntry()->GetPageType());
     EXPECT_EQ(NAVIGATION_TYPE_IN_PAGE, details.type);
   }
 }
 
 }  // namespace content