content/browser/frame_host/navigation_controller_impl_browsertest.cc - Issue 2682193002: Convert NavigationController unit and browser tests to use the new navigation callbacks.

Unified Diff: content/browser/frame_host/navigation_controller_impl_browsertest.cc

Issue 2682193002: Convert NavigationController unit and browser tests to use the new navigation callbacks. (Closed)

Patch Set: Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« content/browser/frame_host/interstitial_page_navigator_impl.cc ('K') | « content/browser/frame_host/interstitial_page_navigator_impl.cc ('k') | content/browser/frame_host/navigation_controller_impl_unittest.cc » ('j') | content/browser/frame_host/navigation_controller_impl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigation_controller_impl_browsertest.cc

diff --git a/content/browser/frame_host/navigation_controller_impl_browsertest.cc b/content/browser/frame_host/navigation_controller_impl_browsertest.cc

index d361fefda9c53fe8b511c9ab578d450f32ff8f24..a6de60df392ab10ebce04edafe7fbb577ee0e155 100644

--- a/content/browser/frame_host/navigation_controller_impl_browsertest.cc

+++ b/content/browser/frame_host/navigation_controller_impl_browsertest.cc

@@ -22,13 +22,13 @@

#include "content/browser/frame_host/frame_navigation_entry.h"

#include "content/browser/frame_host/frame_tree.h"

#include "content/browser/frame_host/navigation_entry_impl.h"

+#include "content/browser/frame_host/navigation_handle_impl.h"

#include "content/browser/loader/resource_dispatcher_host_impl.h"

#include "content/browser/web_contents/web_contents_impl.h"

#include "content/common/frame_messages.h"

#include "content/common/page_state_serialization.h"

#include "content/common/site_isolation_policy.h"

#include "content/public/browser/navigation_controller.h"

-#include "content/public/browser/navigation_handle.h"

#include "content/public/browser/render_view_host.h"

#include "content/public/browser/resource_dispatcher_host.h"

#include "content/public/browser/resource_dispatcher_host_delegate.h"

@@ -578,9 +578,9 @@ class NoNavigationsObserver : public WebContentsObserver {

: WebContentsObserver(web_contents) {}

private:

- void DidNavigateAnyFrame(RenderFrameHost* render_frame_host,

- const LoadCommittedDetails& details,

- const FrameNavigateParams& params) override {

+ void DidFinishNavigation(NavigationHandle* navigation_handle) override {

+ if (!navigation_handle->HasCommitted())

+ return;

FAIL() << "No navigations should occur";

}

};

@@ -608,36 +608,40 @@ class FrameNavigateParamsCapturer : public WebContentsObserver {

message_loop_runner_->Run();

}

- const FrameNavigateParams& params() const {

- EXPECT_EQ(1U, params_.size());

- return params_[0];

+ ui::PageTransition transition() {

+ EXPECT_EQ(1U, transitions_.size());

+ return transitions_[0];

}

- const std::vector<FrameNavigateParams>& all_params() const {

- return params_;

+ NavigationType type() {

+ EXPECT_EQ(1U, types_.size());

+ return types_[0];

}

- const LoadCommittedDetails& details() const {

- EXPECT_EQ(1U, details_.size());

- return details_[0];

+ bool is_in_page() {

+ EXPECT_EQ(1U, is_in_pages_.size());

+ return is_in_pages_[0];

}

- const std::vector<LoadCommittedDetails>& all_details() const {

- return details_;

- }

+ const std::vector<ui::PageTransition>& transitions() { return transitions_; }

+ const std::vector<GURL>& urls() { return urls_; }

+ const std::vector<NavigationType>& types() { return types_; }

+ const std::vector<bool>& is_in_pages() { return is_in_pages_; }

private:

- void DidNavigateAnyFrame(RenderFrameHost* render_frame_host,

- const LoadCommittedDetails& details,

- const FrameNavigateParams& params) override {

- RenderFrameHostImpl* rfh =

- static_cast<RenderFrameHostImpl*>(render_frame_host);

- if (rfh->frame_tree_node()->frame_tree_node_id() != frame_tree_node_id_)

+ void DidFinishNavigation(NavigationHandle* navigation_handle) override {

+ if (!navigation_handle->HasCommitted())

+ return;

+ if (navigation_handle->GetFrameTreeNodeId() != frame_tree_node_id_)

return;

--navigations_remaining_;

- params_.push_back(params);

- details_.push_back(details);

+ transitions_.push_back(navigation_handle->GetPageTransition());

+ urls_.push_back(navigation_handle->GetURL());

+ types_.push_back(static_cast<NavigationHandleImpl*>(navigation_handle)->

+ navigation_type());

+ is_in_pages_.push_back(navigation_handle->IsSamePage());

if (!navigations_remaining_ &&

(!web_contents()->IsLoading() || !wait_for_load_))

message_loop_runner_->Quit();

@@ -657,11 +661,10 @@ class FrameNavigateParamsCapturer : public WebContentsObserver {

// Whether to also wait for the load to complete.

bool wait_for_load_;

- // The params of the navigations.

- std::vector<FrameNavigateParams> params_;

- // The details of the navigations.

- std::vector<LoadCommittedDetails> details_;

+ std::vector<ui::PageTransition> transitions_;

+ std::vector<GURL> urls_;

+ std::vector<NavigationType> types_;

nasko 2017/02/09 00:29:11 nit: navigation_types_

jam 2017/02/09 01:15:03 Done.

+ std::vector<bool> is_in_pages_;

// The MessageLoopRunner used to spin the message loop.

scoped_refptr<MessageLoopRunner> message_loop_runner_;

@@ -916,7 +919,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

FrameNavigateParamsCapturer capturer(root);

NavigateFrameToURL(root, error_url);

capturer.Wait();

- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.type());

NavigationEntry* entry = controller.GetLastCommittedEntry();

EXPECT_EQ(PAGE_TYPE_ERROR, entry->GetPageType());

EXPECT_EQ(2, controller.GetEntryCount());

@@ -931,7 +934,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

FrameNavigateParamsCapturer capturer(root);

NavigateFrameToURL(root, error_url);

capturer.Wait();

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

NavigationEntry* entry = controller.GetLastCommittedEntry();

EXPECT_EQ(PAGE_TYPE_ERROR, entry->GetPageType());

EXPECT_EQ(2, controller.GetEntryCount());

@@ -949,7 +952,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

FrameNavigateParamsCapturer capturer(root);

RendererLocationReplace(shell(), error_url);

capturer.Wait();

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

NavigationEntry* entry = controller.GetLastCommittedEntry();

EXPECT_EQ(PAGE_TYPE_ERROR, entry->GetPageType());

EXPECT_EQ(3, controller.GetEntryCount());

@@ -967,7 +970,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

FrameNavigateParamsCapturer capturer(root);

RendererLocationReplace(shell(), error_url);

capturer.Wait();

- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.type());

NavigationEntry* entry = controller.GetLastCommittedEntry();

EXPECT_EQ(PAGE_TYPE_ERROR, entry->GetPageType());

EXPECT_EQ(4, controller.GetEntryCount());

@@ -997,9 +1000,9 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

// TODO(avi,creis): Why is this (and quite a few others below) a "link"

// transition? Lots of these transitions should be cleaned up.

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_LINK));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);

- EXPECT_FALSE(capturer.details().is_in_page);

+ capturer.transition(), ui::PAGE_TRANSITION_LINK));

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.type());

+ EXPECT_FALSE(capturer.is_in_page());

}

{

@@ -1009,9 +1012,9 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root, script));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_LINK));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);

- EXPECT_TRUE(capturer.details().is_in_page);

+ capturer.transition(), ui::PAGE_TRANSITION_LINK));

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.type());

+ EXPECT_TRUE(capturer.is_in_page());

}

{

@@ -1021,9 +1024,9 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root, script));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_LINK));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);

- EXPECT_FALSE(capturer.details().is_in_page);

+ capturer.transition(), ui::PAGE_TRANSITION_LINK));

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.type());

+ EXPECT_FALSE(capturer.is_in_page());

}

{

@@ -1035,11 +1038,11 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root, script));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition,

+ capturer.transition(),

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |

ui::PAGE_TRANSITION_CLIENT_REDIRECT)));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);

- EXPECT_FALSE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.type());

+ EXPECT_FALSE(capturer.is_in_page());

}

{

@@ -1050,11 +1053,11 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root, script));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition,

+ capturer.transition(),

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |

ui::PAGE_TRANSITION_CLIENT_REDIRECT)));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);

- EXPECT_TRUE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.type());

+ EXPECT_TRUE(capturer.is_in_page());

}

if (AreAllSitesIsolatedForTesting()) {

@@ -1066,11 +1069,11 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root, script));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition,

+ capturer.transition(),

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |

ui::PAGE_TRANSITION_CLIENT_REDIRECT)));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);

- EXPECT_FALSE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.type());

+ EXPECT_FALSE(capturer.is_in_page());

}

@@ -1095,12 +1098,12 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

shell()->web_contents()->GetController().GoBack();

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition,

+ capturer.transition(),

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |

ui::PAGE_TRANSITION_FORWARD_BACK |

ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

- EXPECT_FALSE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

+ EXPECT_FALSE(capturer.is_in_page());

}

{

@@ -1109,12 +1112,12 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

shell()->web_contents()->GetController().GoForward();

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition,

+ capturer.transition(),

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |

ui::PAGE_TRANSITION_FORWARD_BACK |

ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

- EXPECT_FALSE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

+ EXPECT_FALSE(capturer.is_in_page());

}

{

@@ -1123,12 +1126,12 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root, "history.back()"));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition,

+ capturer.transition(),

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |

ui::PAGE_TRANSITION_FORWARD_BACK |

ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

- EXPECT_FALSE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

+ EXPECT_FALSE(capturer.is_in_page());

}

{

@@ -1137,12 +1140,12 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root, "history.forward()"));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition,

+ capturer.transition(),

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |

ui::PAGE_TRANSITION_FORWARD_BACK |

ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

- EXPECT_FALSE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

+ EXPECT_FALSE(capturer.is_in_page());

}

{

@@ -1151,12 +1154,12 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root, "history.go(-1)"));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition,

+ capturer.transition(),

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |

ui::PAGE_TRANSITION_FORWARD_BACK |

ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

- EXPECT_FALSE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

+ EXPECT_FALSE(capturer.is_in_page());

}

{

@@ -1165,12 +1168,12 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root, "history.go(1)"));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition,

+ capturer.transition(),

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |

ui::PAGE_TRANSITION_FORWARD_BACK |

ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

- EXPECT_FALSE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

+ EXPECT_FALSE(capturer.is_in_page());

}

{

@@ -1179,9 +1182,9 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

shell()->web_contents()->GetController().Reload(ReloadType::NORMAL, false);

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_RELOAD));

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

- EXPECT_FALSE(capturer.details().is_in_page);

+ capturer.transition(), ui::PAGE_TRANSITION_RELOAD));

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

+ EXPECT_FALSE(capturer.is_in_page());

}

{

@@ -1190,11 +1193,11 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root, "location.reload()"));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition,

+ capturer.transition(),

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |

ui::PAGE_TRANSITION_CLIENT_REDIRECT)));

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

- EXPECT_FALSE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

+ EXPECT_FALSE(capturer.is_in_page());

}

{

@@ -1208,11 +1211,11 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root, script));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition,

+ capturer.transition(),

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |

ui::PAGE_TRANSITION_CLIENT_REDIRECT)));

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

- EXPECT_FALSE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

+ EXPECT_FALSE(capturer.is_in_page());

}

// Now, various in-page navigations.

@@ -1225,11 +1228,11 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root, script));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition,

+ capturer.transition(),

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |

ui::PAGE_TRANSITION_CLIENT_REDIRECT)));

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

- EXPECT_TRUE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

+ EXPECT_TRUE(capturer.is_in_page());

}

// Back and forward across a fragment navigation.

@@ -1247,12 +1250,12 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

shell()->web_contents()->GetController().GoBack();

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition,

+ capturer.transition(),

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |

ui::PAGE_TRANSITION_FORWARD_BACK |

ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

- EXPECT_TRUE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

+ EXPECT_TRUE(capturer.is_in_page());

}

{

@@ -1261,11 +1264,11 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

shell()->web_contents()->GetController().GoForward();

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition,

+ capturer.transition(),

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |

ui::PAGE_TRANSITION_FORWARD_BACK)));

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

- EXPECT_TRUE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

+ EXPECT_TRUE(capturer.is_in_page());

}

// Back and forward across a pushState-created navigation.

@@ -1281,12 +1284,12 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

shell()->web_contents()->GetController().GoBack();

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition,

+ capturer.transition(),

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |

ui::PAGE_TRANSITION_FORWARD_BACK |

ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

- EXPECT_TRUE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

+ EXPECT_TRUE(capturer.is_in_page());

}

{

@@ -1295,11 +1298,11 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

shell()->web_contents()->GetController().GoForward();

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition,

+ capturer.transition(),

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |

ui::PAGE_TRANSITION_FORWARD_BACK)));

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

- EXPECT_TRUE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

+ EXPECT_TRUE(capturer.is_in_page());

}

@@ -1323,8 +1326,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

NavigateFrameToURL(root, frame_url);

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_LINK));

- EXPECT_EQ(NAVIGATION_TYPE_SAME_PAGE, capturer.details().type);

+ capturer.transition(), ui::PAGE_TRANSITION_LINK));

+ EXPECT_EQ(NAVIGATION_TYPE_SAME_PAGE, capturer.type());

}

@@ -1368,8 +1371,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

NavigateFrameToURL(root, GURL());

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_LINK));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);

+ capturer.transition(), ui::PAGE_TRANSITION_LINK));

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.type());

}

@@ -1408,8 +1411,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

NavigateFrameToURL(root->child_at(0), frame_url);

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);

+ capturer.transition(), ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.type());

}

{

@@ -1418,8 +1421,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

shell()->web_contents()->GetController().GoBack();

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_AUTO_SUBFRAME));

- EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.details().type);

+ capturer.transition(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));

+ EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.type());

}

{

@@ -1428,8 +1431,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

shell()->web_contents()->GetController().GoForward();

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_AUTO_SUBFRAME));

- EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.details().type);

+ capturer.transition(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));

+ EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.type());

}

{

@@ -1440,8 +1443,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

NavigateFrameToURL(root->child_at(0), frame_url);

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);

+ capturer.transition(), ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.type());

}

{

@@ -1451,8 +1454,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root->child_at(0), script));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);

+ capturer.transition(), ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.type());

}

{

@@ -1464,8 +1467,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root->child_at(0), script));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);

+ capturer.transition(), ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.type());

}

{

@@ -1488,8 +1491,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root->child_at(0), script));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);

+ capturer.transition(), ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.type());

}

{

@@ -1547,18 +1550,16 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

NavigateFrameToURL(root, frame_url);

capturer.Wait();

- std::vector<FrameNavigateParams> params = capturer.all_params();

- std::vector<LoadCommittedDetails> details = capturer.all_details();

- ASSERT_EQ(2U, params.size());

- ASSERT_EQ(2U, details.size());

+ ASSERT_EQ(2U, capturer.transitions().size());

+ ASSERT_EQ(2U, capturer.types().size());

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- params[0].transition, ui::PAGE_TRANSITION_LINK));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, details[0].type);

+ capturer.transitions()[0], ui::PAGE_TRANSITION_LINK));

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.types()[0]);

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- params[1].transition,

+ capturer.transitions()[1],

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |

ui::PAGE_TRANSITION_CLIENT_REDIRECT)));

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, details[1].type);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.types()[1]);

}

@@ -1583,9 +1584,9 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root, script));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_LINK));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);

- EXPECT_TRUE(capturer.details().is_in_page);

+ capturer.transition(), ui::PAGE_TRANSITION_LINK));

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.type());

+ EXPECT_TRUE(capturer.is_in_page());

}

{

@@ -1595,9 +1596,9 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root, script));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_LINK));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);

- EXPECT_FALSE(capturer.details().is_in_page);

+ capturer.transition(), ui::PAGE_TRANSITION_LINK));

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.type());

+ EXPECT_FALSE(capturer.is_in_page());

}

// Second verse, same as the first. (But in a subframe.)

@@ -1622,9 +1623,9 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root->child_at(0), script));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);

- EXPECT_TRUE(capturer.details().is_in_page);

+ capturer.transition(), ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.type());

+ EXPECT_TRUE(capturer.is_in_page());

}

{

@@ -1634,9 +1635,9 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

EXPECT_TRUE(ExecuteScript(root->child_at(0), script));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);

- EXPECT_FALSE(capturer.details().is_in_page);

+ capturer.transition(), ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.type());

+ EXPECT_FALSE(capturer.is_in_page());

}

@@ -1919,8 +1920,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

std::string script = "history.pushState({}, 'foo', 'foo')";

EXPECT_TRUE(ExecuteScript(root, script));

capturer.Wait();

- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);

- EXPECT_TRUE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.type());

+ EXPECT_TRUE(capturer.is_in_page());

}

// 2. Create an iframe.

@@ -2211,8 +2212,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

NavigateFrameToURL(root->child_at(0), frame_url2);

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);

+ capturer.transition(), ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.type());

}

// We should have created a new NavigationEntry with the same main frame URL.

@@ -2262,8 +2263,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

deleted_observer.WaitUntilDeleted();

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);

+ capturer.transition(), ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.type());

}

// We should have created a new NavigationEntry with the same main frame URL.

@@ -2298,8 +2299,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

deleted_observer.WaitUntilDeleted();

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);

+ capturer.transition(), ui::PAGE_TRANSITION_MANUAL_SUBFRAME));

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.type());

}

// We should have created a new NavigationEntry with the same main frame URL.

@@ -2448,8 +2449,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

shell()->web_contents()->GetController().GoBack();

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_AUTO_SUBFRAME));

- EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.details().type);

+ capturer.transition(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));

+ EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.type());

}

EXPECT_EQ(3, controller.GetEntryCount());

EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());

@@ -2465,8 +2466,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

shell()->web_contents()->GetController().GoBack();

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_AUTO_SUBFRAME));

- EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.details().type);

+ capturer.transition(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));

+ EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.type());

}

EXPECT_EQ(3, controller.GetEntryCount());

EXPECT_EQ(0, controller.GetLastCommittedEntryIndex());

@@ -2482,8 +2483,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

shell()->web_contents()->GetController().GoForward();

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_AUTO_SUBFRAME));

- EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.details().type);

+ capturer.transition(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));

+ EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.type());

}

EXPECT_EQ(3, controller.GetEntryCount());

EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());

@@ -2499,8 +2500,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

shell()->web_contents()->GetController().GoForward();

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_AUTO_SUBFRAME));

- EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.details().type);

+ capturer.transition(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));

+ EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.type());

}

EXPECT_EQ(3, controller.GetEntryCount());

EXPECT_EQ(2, controller.GetLastCommittedEntryIndex());

@@ -4056,9 +4057,9 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

controller.Reload(ReloadType::NORMAL, false);

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition, ui::PAGE_TRANSITION_RELOAD));

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

- EXPECT_FALSE(capturer.details().is_in_page);

+ capturer.transition(), ui::PAGE_TRANSITION_RELOAD));

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

+ EXPECT_FALSE(capturer.is_in_page());

}

// 4. Add the iframe again.

@@ -4382,8 +4383,8 @@ void DoReplaceStateWhilePending(Shell* shell,

// The fact that there was a pending entry shouldn't interfere with the

// classification.

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

- EXPECT_TRUE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

+ EXPECT_TRUE(capturer.is_in_page());

}

ResourceDispatcherHost::Get()->SetDelegate(nullptr);

@@ -4468,8 +4469,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

std::string script = "history.pushState({}, '', 'pushed')";

EXPECT_TRUE(ExecuteScript(root, script));

capturer.Wait();

- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);

- EXPECT_TRUE(capturer.details().is_in_page);

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.type());

+ EXPECT_TRUE(capturer.is_in_page());

}

// The in-page navigation should not have replaced the previous entry.

@@ -4549,7 +4550,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

"/navigation_controller/simple_page_2.html"));

NavigateFrameToURL(root->child_at(0), frame_url);

capturer.Wait();

- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.type());

}

{

@@ -4646,7 +4647,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,

"/navigation_controller/simple_page_2.html"));

NavigateFrameToURL(root->child_at(0), frame_url);

capturer.Wait();

- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);

+ EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.type());

}

{

@@ -4801,10 +4802,10 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, ReloadOriginalRequest) {

EXPECT_TRUE(ExecuteScript(shell(), script));

capturer.Wait();

EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(

- capturer.params().transition,

+ capturer.transition(),

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |

ui::PAGE_TRANSITION_CLIENT_REDIRECT)));

- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);

+ EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.type());

}

// Modify an entry in the session history and reload the original request.

@@ -4832,9 +4833,9 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, ReloadOriginalRequest) {

capturer.set_wait_for_load(false);

capturer.set_navigations_remaining(2);

capturer.Wait();

- EXPECT_EQ(2U, capturer.all_details().size());

- EXPECT_EQ(modified_url, capturer.all_params()[0].url);

- EXPECT_EQ(original_url, capturer.all_params()[1].url);

+ EXPECT_EQ(2U, capturer.urls().size());

+ EXPECT_EQ(modified_url, capturer.urls()[0]);

+ EXPECT_EQ(original_url, capturer.urls()[1]);

EXPECT_EQ(original_url, shell()->web_contents()->GetLastCommittedURL());

}

@@ -6279,10 +6280,10 @@ class AllowDialogIPCOnCommitFilter : public BrowserMessageFilter,

void SetCallback(Callback callback) { callback_ = callback; }

private:

- void DidNavigateAnyFrame(RenderFrameHost* render_frame_host,

- const LoadCommittedDetails& details,

- const FrameNavigateParams& params) override {

+ void DidFinishNavigation(NavigationHandle* navigation_handle) override {

DCHECK_CURRENTLY_ON(BrowserThread::UI);

+ if (!navigation_handle->HasCommitted())

+ return;

// Resume the message.

callback_.Run();