Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(619)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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
Download patch
« no previous file with comments | « content/browser/frame_host/navigation_controller_impl.cc ('k') | content/browser/frame_host/navigation_entry_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/navigation_controller_impl_unittest.cc
diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc
index b58343b1ecf001471bc90b44dcb6765165c12283..f3aea72759c7ce4a0dc158ea7b70656c1664cf31 100644
--- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
@@ -354,7 +354,8 @@ TEST_F(NavigationControllerTest, LoadURL) {
const GURL url1("http://foo1");
const GURL url2("http://foo2");
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
// Creating a pending notification should not have issued any of the
// notifications we're listening for.
EXPECT_EQ(0U, notifications.size());
@@ -398,7 +399,8 @@ TEST_F(NavigationControllerTest, LoadURL) {
EXPECT_FALSE(controller.GetVisibleEntry()->GetTimestamp().is_null());
// Load another...
- controller.LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
// The load should now be pending.
EXPECT_EQ(controller.GetEntryCount(), 1);
@@ -455,14 +457,16 @@ TEST_F(NavigationControllerTest, LoadURLSameTime) {
const GURL url1("http://foo1");
const GURL url2("http://foo2");
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(0, url1);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;
// Load another...
- controller.LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
// Simulate the beforeunload ack for the cross-site transition, and then the
// commit.
@@ -514,7 +518,7 @@ TEST_F(NavigationControllerTest, LoadURLWithParams) {
NavigationController::LoadURLParams load_params(GURL("http://foo"));
load_params.referrer =
Referrer(GURL("http://referrer"), blink::WebReferrerPolicyDefault);
- load_params.transition_type = PAGE_TRANSITION_GENERATED;
+ load_params.transition_type = ui::PAGE_TRANSITION_GENERATED;
load_params.extra_headers = "content-type: text/plain";
load_params.load_type = NavigationController::LOAD_TYPE_DEFAULT;
load_params.is_renderer_initiated = true;
@@ -555,7 +559,7 @@ TEST_F(NavigationControllerTest, LoadURLWithExtraParams_HttpPost) {
NavigationControllerImpl& controller = controller_impl();
NavigationController::LoadURLParams load_params(GURL("https://posturl"));
- load_params.transition_type = PAGE_TRANSITION_TYPED;
+ load_params.transition_type = ui::PAGE_TRANSITION_TYPED;
load_params.load_type =
NavigationController::LOAD_TYPE_BROWSER_INITIATED_HTTP_POST;
load_params.override_user_agent = NavigationController::UA_OVERRIDE_TRUE;
@@ -588,7 +592,8 @@ TEST_F(NavigationControllerTest, LoadURL_SamePage) {
const GURL url1("http://foo1");
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_EQ(0U, notifications.size());
main_test_rfh()->SendNavigate(0, url1);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
@@ -598,7 +603,8 @@ TEST_F(NavigationControllerTest, LoadURL_SamePage) {
const base::Time timestamp = controller.GetVisibleEntry()->GetTimestamp();
EXPECT_FALSE(timestamp.is_null());
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_EQ(0U, notifications.size());
main_test_rfh()->SendNavigate(0, url1);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
@@ -630,11 +636,12 @@ TEST_F(NavigationControllerTest, LoadURL_SamePage_DifferentMethod) {
const GURL url1("http://foo1");
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = 0;
params.url = url1;
- params.transition = PAGE_TRANSITION_TYPED;
+ params.transition = ui::PAGE_TRANSITION_TYPED;
params.is_post = true;
params.post_id = 123;
params.page_state = PageState::CreateForTesting(url1, false, 0, 0);
@@ -646,7 +653,8 @@ TEST_F(NavigationControllerTest, LoadURL_SamePage_DifferentMethod) {
EXPECT_TRUE(entry->GetHasPostData());
EXPECT_EQ(entry->GetPostID(), 123);
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(0, url1);
// We should not have produced a new session history entry.
@@ -666,7 +674,8 @@ TEST_F(NavigationControllerTest, LoadURL_Discarded) {
const GURL url1("http://foo1");
const GURL url2("http://foo2");
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_EQ(0U, notifications.size());
main_test_rfh()->SendNavigate(0, url1);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
@@ -676,7 +685,8 @@ TEST_F(NavigationControllerTest, LoadURL_Discarded) {
const base::Time timestamp = controller.GetVisibleEntry()->GetTimestamp();
EXPECT_FALSE(timestamp.is_null());
- controller.LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
controller.DiscardNonCommittedEntries();
EXPECT_EQ(0U, notifications.size());
@@ -704,7 +714,7 @@ TEST_F(NavigationControllerTest, LoadURL_NoPending) {
// First make an existing committed entry.
const GURL kExistingURL1("http://eh");
controller.LoadURL(
- kExistingURL1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ kExistingURL1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(0, kExistingURL1);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;
@@ -734,7 +744,7 @@ TEST_F(NavigationControllerTest, LoadURL_NewPending) {
// First make an existing committed entry.
const GURL kExistingURL1("http://eh");
controller.LoadURL(
- kExistingURL1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ kExistingURL1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(0, kExistingURL1);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;
@@ -742,7 +752,7 @@ TEST_F(NavigationControllerTest, LoadURL_NewPending) {
// Make a pending entry to somewhere new.
const GURL kExistingURL2("http://bee");
controller.LoadURL(
- kExistingURL2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ kExistingURL2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_EQ(0U, notifications.size());
// After the beforeunload but before it commits, do a new navigation.
@@ -770,14 +780,14 @@ TEST_F(NavigationControllerTest, LoadURL_ExistingPending) {
// First make some history.
const GURL kExistingURL1("http://foo/eh");
controller.LoadURL(
- kExistingURL1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ kExistingURL1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(0, kExistingURL1);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;
const GURL kExistingURL2("http://foo/bee");
controller.LoadURL(
- kExistingURL2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ kExistingURL2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(1, kExistingURL2);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;
@@ -814,7 +824,7 @@ TEST_F(NavigationControllerTest, LoadURL_PrivilegedPending) {
// First make some history, starting with a privileged URL.
const GURL kExistingURL1("http://privileged");
controller.LoadURL(
- kExistingURL1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ kExistingURL1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
// Pretend it has bindings so we can tell if we incorrectly copy it.
test_rvh()->AllowBindings(2);
main_test_rfh()->SendNavigate(0, kExistingURL1);
@@ -824,7 +834,7 @@ TEST_F(NavigationControllerTest, LoadURL_PrivilegedPending) {
// Navigate cross-process to a second URL.
const GURL kExistingURL2("http://foo/eh");
controller.LoadURL(
- kExistingURL2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ kExistingURL2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
test_rvh()->SendBeforeUnloadACK(true);
TestRenderFrameHost* foo_rfh = contents()->GetPendingMainFrame();
foo_rfh->SendNavigate(1, kExistingURL2);
@@ -868,14 +878,14 @@ TEST_F(NavigationControllerTest, LoadURL_BackPreemptsPending) {
// First make some history.
const GURL kExistingURL1("http://foo/eh");
controller.LoadURL(
- kExistingURL1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ kExistingURL1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(0, kExistingURL1);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;
const GURL kExistingURL2("http://foo/bee");
controller.LoadURL(
- kExistingURL2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ kExistingURL2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(1, kExistingURL2);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;
@@ -883,7 +893,7 @@ TEST_F(NavigationControllerTest, LoadURL_BackPreemptsPending) {
// Now make a pending new navigation.
const GURL kNewURL("http://foo/see");
controller.LoadURL(
- kNewURL, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ kNewURL, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_EQ(0U, notifications.size());
EXPECT_EQ(-1, controller.GetPendingEntryIndex());
EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
@@ -919,7 +929,7 @@ TEST_F(NavigationControllerTest, LoadURL_IgnorePreemptsPending) {
// Now make a pending new navigation.
const GURL kNewURL("http://eh");
controller.LoadURL(
- kNewURL, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ kNewURL, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_EQ(0U, notifications.size());
EXPECT_EQ(-1, controller.GetPendingEntryIndex());
EXPECT_TRUE(controller.GetPendingEntry());
@@ -956,7 +966,7 @@ TEST_F(NavigationControllerTest, LoadURL_AbortDoesntCancelPending) {
// Start with a pending new navigation.
const GURL kNewURL("http://eh");
controller.LoadURL(
- kNewURL, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ kNewURL, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_EQ(0U, notifications.size());
EXPECT_EQ(-1, controller.GetPendingEntryIndex());
EXPECT_TRUE(controller.GetPendingEntry());
@@ -1002,7 +1012,7 @@ TEST_F(NavigationControllerTest, LoadURL_RedirectAbortDoesntShowPendingURL) {
// First make an existing committed entry.
const GURL kExistingURL("http://foo/eh");
controller.LoadURL(kExistingURL, content::Referrer(),
- content::PAGE_TRANSITION_TYPED, std::string());
+ ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(1, kExistingURL);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;
@@ -1015,7 +1025,7 @@ TEST_F(NavigationControllerTest, LoadURL_RedirectAbortDoesntShowPendingURL) {
// Now make a pending new navigation, initiated by the renderer.
const GURL kNewURL("http://foo/bee");
NavigationController::LoadURLParams load_url_params(kNewURL);
- load_url_params.transition_type = PAGE_TRANSITION_TYPED;
+ load_url_params.transition_type = ui::PAGE_TRANSITION_TYPED;
load_url_params.is_renderer_initiated = true;
controller.LoadURLWithParams(load_url_params);
EXPECT_EQ(0U, notifications.size());
@@ -1076,7 +1086,8 @@ TEST_F(NavigationControllerTest, LoadURL_WithBindings) {
const GURL url2("http://foo2");
// Navigate to a first, unprivileged URL.
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_EQ(NavigationEntryImpl::kInvalidBindings,
NavigationEntryImpl::FromNavigationEntry(
controller.GetPendingEntry())->bindings());
@@ -1099,7 +1110,8 @@ TEST_F(NavigationControllerTest, LoadURL_WithBindings) {
// Navigate to a second URL, simulate the beforeunload ack for the cross-site
// transition, and set bindings on the pending RenderViewHost to simulate a
// privileged url.
- controller.LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
orig_rfh->GetRenderViewHost()->SendBeforeUnloadACK(true);
TestRenderFrameHost* new_rfh = contents()->GetPendingMainFrame();
new_rfh->GetRenderViewHost()->AllowBindings(1);
@@ -1128,7 +1140,8 @@ TEST_F(NavigationControllerTest, Reload) {
const GURL url1("http://foo1");
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_EQ(0U, notifications.size());
main_test_rfh()->SendNavigate(0, url1);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
@@ -1181,7 +1194,8 @@ TEST_F(NavigationControllerTest, Reload_GeneratesNewPage) {
const GURL url1("http://foo1");
const GURL url2("http://foo2");
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(0, url1);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;
@@ -1210,7 +1224,8 @@ TEST_F(NavigationControllerTest, ReloadWithGuest) {
NavigationControllerImpl& controller = controller_impl();
const GURL url1("http://foo1");
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(0, url1);
ASSERT_TRUE(controller.GetVisibleEntry());
@@ -1245,7 +1260,7 @@ TEST_F(NavigationControllerTest, ReloadOriginalRequestURL) {
// Load up the original URL, but get redirected.
controller.LoadURL(
- original_url, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ original_url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_EQ(0U, notifications.size());
main_test_rfh()->SendNavigateWithOriginalRequestURL(
0, final_url, original_url);
@@ -1300,7 +1315,8 @@ TEST_F(NavigationControllerTest, ReloadOriginalRequestURL) {
TEST_F(NavigationControllerTest, ResetEntryValuesAfterCommit) {
NavigationControllerImpl& controller = controller_impl();
const GURL url1("http://foo1");
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
// Set up some sample values.
const unsigned char* raw_data =
@@ -1346,7 +1362,8 @@ TEST_F(NavigationControllerTest, ResetEntryValuesAfterCommit) {
TEST_F(NavigationControllerTest, RedirectsAreNotResetByCommit) {
NavigationControllerImpl& controller = controller_impl();
const GURL url1("http://foo1");
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
// Set up some redirect values.
std::vector<GURL> redirects;
@@ -1437,12 +1454,13 @@ TEST_F(NavigationControllerTest, Back_GeneratesNewPage) {
const GURL url3("http://foo/3");
controller.LoadURL(
- url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(0, url1);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;
- controller.LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(1, url2);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;
@@ -1489,13 +1507,14 @@ TEST_F(NavigationControllerTest, Back_NewPending) {
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;
- // controller.LoadURL(kUrl2, PAGE_TRANSITION_TYPED);
+ // controller.LoadURL(kUrl2, ui::PAGE_TRANSITION_TYPED);
main_test_rfh()->SendNavigate(1, kUrl2);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;
// Now start a new pending navigation and go back before it commits.
- controller.LoadURL(kUrl3, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ kUrl3, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_EQ(-1, controller.GetPendingEntryIndex());
EXPECT_EQ(kUrl3, controller.GetPendingEntry()->GetURL());
controller.GoBack();
@@ -1678,7 +1697,8 @@ TEST_F(NavigationControllerTest, Redirect) {
const GURL url2("http://foo2"); // Redirection target
// First request
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_EQ(0U, notifications.size());
main_test_rfh()->SendNavigate(0, url2);
@@ -1686,7 +1706,8 @@ TEST_F(NavigationControllerTest, Redirect) {
navigation_entry_committed_counter_ = 0;
// Second request
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_TRUE(controller.GetPendingEntry());
EXPECT_EQ(controller.GetPendingEntryIndex(), -1);
@@ -1695,7 +1716,7 @@ TEST_F(NavigationControllerTest, Redirect) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = 0;
params.url = url2;
- params.transition = PAGE_TRANSITION_SERVER_REDIRECT;
+ params.transition = ui::PAGE_TRANSITION_SERVER_REDIRECT;
params.redirects.push_back(GURL("http://foo1"));
params.redirects.push_back(GURL("http://foo2"));
params.should_update_history = false;
@@ -1735,7 +1756,8 @@ TEST_F(NavigationControllerTest, PostThenRedirect) {
const GURL url2("http://foo2"); // Redirection target
// First request as POST
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
controller.GetVisibleEntry()->SetHasPostData(true);
EXPECT_EQ(0U, notifications.size());
@@ -1744,7 +1766,8 @@ TEST_F(NavigationControllerTest, PostThenRedirect) {
navigation_entry_committed_counter_ = 0;
// Second request
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_TRUE(controller.GetPendingEntry());
EXPECT_EQ(controller.GetPendingEntryIndex(), -1);
@@ -1753,7 +1776,7 @@ TEST_F(NavigationControllerTest, PostThenRedirect) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = 0;
params.url = url2;
- params.transition = PAGE_TRANSITION_SERVER_REDIRECT;
+ params.transition = ui::PAGE_TRANSITION_SERVER_REDIRECT;
params.redirects.push_back(GURL("http://foo1"));
params.redirects.push_back(GURL("http://foo2"));
params.should_update_history = false;
@@ -1792,7 +1815,8 @@ TEST_F(NavigationControllerTest, ImmediateRedirect) {
const GURL url2("http://foo2"); // Redirection target
// First request
- controller.LoadURL(url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_TRUE(controller.GetPendingEntry());
EXPECT_EQ(controller.GetPendingEntryIndex(), -1);
@@ -1801,7 +1825,7 @@ TEST_F(NavigationControllerTest, ImmediateRedirect) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = 0;
params.url = url2;
- params.transition = PAGE_TRANSITION_SERVER_REDIRECT;
+ params.transition = ui::PAGE_TRANSITION_SERVER_REDIRECT;
params.redirects.push_back(GURL("http://foo1"));
params.redirects.push_back(GURL("http://foo2"));
params.should_update_history = false;
@@ -1845,7 +1869,7 @@ TEST_F(NavigationControllerTest, NewSubframe) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = 1;
params.url = url2;
- params.transition = PAGE_TRANSITION_MANUAL_SUBFRAME;
+ params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME;
params.should_update_history = false;
params.gesture = NavigationGestureUser;
params.is_post = false;
@@ -1882,7 +1906,7 @@ TEST_F(NavigationControllerTest, SubframeOnEmptyPage) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = 1;
params.url = url;
- params.transition = PAGE_TRANSITION_AUTO_SUBFRAME;
+ params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;
params.should_update_history = false;
params.gesture = NavigationGestureAuto;
params.is_post = false;
@@ -1910,7 +1934,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = 0;
params.url = url2;
- params.transition = PAGE_TRANSITION_AUTO_SUBFRAME;
+ params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;
params.should_update_history = false;
params.gesture = NavigationGestureUser;
params.is_post = false;
@@ -1943,7 +1967,7 @@ TEST_F(NavigationControllerTest, BackSubframe) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = 1;
params.url = url2;
- params.transition = PAGE_TRANSITION_MANUAL_SUBFRAME;
+ params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME;
params.should_update_history = false;
params.gesture = NavigationGestureUser;
params.is_post = false;
@@ -2037,7 +2061,7 @@ TEST_F(NavigationControllerTest, InPage) {
FrameHostMsg_DidCommitProvisionalLoad_Params self_params;
self_params.page_id = 0;
self_params.url = url1;
- self_params.transition = PAGE_TRANSITION_LINK;
+ self_params.transition = ui::PAGE_TRANSITION_LINK;
self_params.should_update_history = false;
self_params.gesture = NavigationGestureUser;
self_params.is_post = false;
@@ -2058,7 +2082,7 @@ TEST_F(NavigationControllerTest, InPage) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = 1;
params.url = url2;
- params.transition = PAGE_TRANSITION_LINK;
+ params.transition = ui::PAGE_TRANSITION_LINK;
params.should_update_history = false;
params.gesture = NavigationGestureUser;
params.is_post = false;
@@ -2146,7 +2170,7 @@ TEST_F(NavigationControllerTest, InPage_Replace) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = 0; // Same page_id
params.url = url2;
- params.transition = PAGE_TRANSITION_LINK;
+ params.transition = ui::PAGE_TRANSITION_LINK;
params.should_update_history = false;
params.gesture = NavigationGestureUser;
params.is_post = false;
@@ -2197,7 +2221,7 @@ TEST_F(NavigationControllerTest, ClientRedirectAfterInPageNavigation) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = 1; // Same page_id
params.url = url;
- params.transition = PAGE_TRANSITION_LINK;
+ params.transition = ui::PAGE_TRANSITION_LINK;
params.redirects.push_back(url);
params.should_update_history = true;
params.gesture = NavigationGestureUnknown;
@@ -2222,7 +2246,7 @@ TEST_F(NavigationControllerTest, ClientRedirectAfterInPageNavigation) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = 2; // New page_id
params.url = url;
- params.transition = PAGE_TRANSITION_CLIENT_REDIRECT;
+ params.transition = ui::PAGE_TRANSITION_CLIENT_REDIRECT;
params.redirects.push_back(GURL("http://foo2/#a"));
params.redirects.push_back(url);
params.should_update_history = true;
@@ -2308,7 +2332,7 @@ TEST_F(NavigationControllerTest, EnforceMaxNavigationCount) {
for (url_index = 0; url_index < kMaxEntryCount; url_index++) {
GURL url(base::StringPrintf("http://www.a.com/%d", url_index));
controller.LoadURL(
- url, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(url_index, url);
}
@@ -2320,7 +2344,7 @@ TEST_F(NavigationControllerTest, EnforceMaxNavigationCount) {
// Navigate some more.
GURL url(base::StringPrintf("http://www.a.com/%d", url_index));
controller.LoadURL(
- url, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(url_index, url);
url_index++;
@@ -2338,7 +2362,7 @@ TEST_F(NavigationControllerTest, EnforceMaxNavigationCount) {
for (int i = 0; i < 3; i++) {
url = GURL(base::StringPrintf("http:////www.a.com/%d", url_index));
controller.LoadURL(
- url, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(url_index, url);
url_index++;
}
@@ -2357,7 +2381,7 @@ TEST_F(NavigationControllerTest, RestoreNavigate) {
GURL url("http://foo");
std::vector<NavigationEntry*> entries;
NavigationEntry* entry = NavigationControllerImpl::CreateNavigationEntry(
- url, Referrer(), PAGE_TRANSITION_RELOAD, false, std::string(),
+ url, Referrer(), ui::PAGE_TRANSITION_RELOAD, false, std::string(),
browser_context());
entry->SetPageID(0);
entry->SetTitle(base::ASCIIToUTF16("Title"));
@@ -2403,7 +2427,7 @@ TEST_F(NavigationControllerTest, RestoreNavigate) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = 0;
params.url = url;
- params.transition = PAGE_TRANSITION_LINK;
+ params.transition = ui::PAGE_TRANSITION_LINK;
params.should_update_history = false;
params.gesture = NavigationGestureUser;
params.is_post = false;
@@ -2437,7 +2461,7 @@ TEST_F(NavigationControllerTest, RestoreNavigateAfterFailure) {
GURL url("http://foo");
std::vector<NavigationEntry*> entries;
NavigationEntry* entry = NavigationControllerImpl::CreateNavigationEntry(
- url, Referrer(), PAGE_TRANSITION_RELOAD, false, std::string(),
+ url, Referrer(), ui::PAGE_TRANSITION_RELOAD, false, std::string(),
browser_context());
entry->SetPageID(0);
entry->SetTitle(base::ASCIIToUTF16("Title"));
@@ -2486,7 +2510,7 @@ TEST_F(NavigationControllerTest, RestoreNavigateAfterFailure) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = 0;
params.url = url;
- params.transition = PAGE_TRANSITION_LINK;
+ params.transition = ui::PAGE_TRANSITION_LINK;
params.should_update_history = false;
params.gesture = NavigationGestureUser;
params.is_post = false;
@@ -2514,13 +2538,13 @@ TEST_F(NavigationControllerTest, Interstitial) {
// First navigate somewhere normal.
const GURL url1("http://foo");
controller.LoadURL(
- url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(0, url1);
// Now navigate somewhere with an interstitial.
const GURL url2("http://bar");
controller.LoadURL(
- url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
NavigationEntryImpl::FromNavigationEntry(controller.GetPendingEntry())->
set_page_type(PAGE_TYPE_INTERSTITIAL);
@@ -2545,19 +2569,19 @@ TEST_F(NavigationControllerTest, RemoveEntry) {
const GURL default_url("http://foo/default");
controller.LoadURL(
- url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(0, url1);
controller.LoadURL(
- url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(1, url2);
controller.LoadURL(
- url3, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url3, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(2, url3);
controller.LoadURL(
- url4, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url4, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(3, url4);
controller.LoadURL(
- url5, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url5, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(4, url5);
// Try to remove the last entry. Will fail because it is the current entry.
@@ -2608,10 +2632,10 @@ TEST_F(NavigationControllerTest, TransientEntry) {
const GURL transient_url("http://foo/transient");
controller.LoadURL(
- url0, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url0, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(0, url0);
controller.LoadURL(
- url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(1, url1);
notifications.Reset();
@@ -2637,7 +2661,7 @@ TEST_F(NavigationControllerTest, TransientEntry) {
// Navigate.
controller.LoadURL(
- url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(2, url2);
// We should have navigated, transient entry should be gone.
@@ -2656,7 +2680,7 @@ TEST_F(NavigationControllerTest, TransientEntry) {
// Initiate a navigation, add a transient then commit navigation.
controller.LoadURL(
- url4, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url4, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
transient_entry = new NavigationEntryImpl;
transient_entry->SetURL(transient_url);
controller.SetTransientEntry(transient_entry);
@@ -2748,10 +2772,10 @@ TEST_F(NavigationControllerTest, ReloadTransient) {
// Load |url0|, and start a pending navigation to |url1|.
controller.LoadURL(
- url0, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url0, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
main_test_rfh()->SendNavigate(0, url0);
controller.LoadURL(
- url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url1, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
// A transient entry is added, interrupting the navigation.
NavigationEntryImpl* transient_entry = new NavigationEntryImpl;
@@ -2850,7 +2874,8 @@ TEST_F(NavigationControllerTest, DontShowRendererURLUntilCommit) {
// For typed navigations (browser-initiated), both pending and visible entries
// should update before commit.
- controller.LoadURL(url0, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ controller.LoadURL(
+ url0, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_EQ(url0, controller.GetPendingEntry()->GetURL());
EXPECT_EQ(url0, controller.GetVisibleEntry()->GetURL());
main_test_rfh()->SendNavigate(0, url0);
@@ -2893,7 +2918,7 @@ TEST_F(NavigationControllerTest, ShowRendererURLInNewTabUntilModified) {
// we show the pending entry's URL as long as the about:blank page is not
// modified.
NavigationController::LoadURLParams load_url_params(url);
- load_url_params.transition_type = PAGE_TRANSITION_LINK;
+ load_url_params.transition_type = ui::PAGE_TRANSITION_LINK;
load_url_params.is_renderer_initiated = true;
controller.LoadURLWithParams(load_url_params);
EXPECT_EQ(url, controller.GetVisibleEntry()->GetURL());
@@ -2933,7 +2958,7 @@ TEST_F(NavigationControllerTest, ShowBrowserURLAfterFailUntilModified) {
// modified. This is possible in cases that the user types a URL into a popup
// tab created with a slow URL.
NavigationController::LoadURLParams load_url_params(url);
- load_url_params.transition_type = PAGE_TRANSITION_TYPED;
+ load_url_params.transition_type = ui::PAGE_TRANSITION_TYPED;
load_url_params.is_renderer_initiated = false;
controller.LoadURLWithParams(load_url_params);
EXPECT_EQ(url, controller.GetVisibleEntry()->GetURL());
@@ -2984,7 +3009,7 @@ TEST_F(NavigationControllerTest, ShowRendererURLAfterFailUntilModified) {
// we show the pending entry's URL as long as the about:blank page is not
// modified.
NavigationController::LoadURLParams load_url_params(url);
- load_url_params.transition_type = PAGE_TRANSITION_LINK;
+ load_url_params.transition_type = ui::PAGE_TRANSITION_LINK;
load_url_params.is_renderer_initiated = true;
controller.LoadURLWithParams(load_url_params);
EXPECT_EQ(url, controller.GetVisibleEntry()->GetURL());
@@ -3031,7 +3056,7 @@ TEST_F(NavigationControllerTest, DontShowRendererURLInNewTabAfterCommit) {
// we show the pending entry's URL as long as the about:blank page is not
// modified.
NavigationController::LoadURLParams load_url_params(url1);
- load_url_params.transition_type = PAGE_TRANSITION_LINK;
+ load_url_params.transition_type = ui::PAGE_TRANSITION_LINK;
load_url_params.is_renderer_initiated = true;
controller.LoadURLWithParams(load_url_params);
EXPECT_EQ(url1, controller.GetVisibleEntry()->GetURL());
@@ -3044,7 +3069,7 @@ TEST_F(NavigationControllerTest, DontShowRendererURLInNewTabAfterCommit) {
// Simulate a commit and then starting a new pending navigation.
main_test_rfh()->SendNavigate(0, url1);
NavigationController::LoadURLParams load_url2_params(url2);
- load_url2_params.transition_type = PAGE_TRANSITION_LINK;
+ load_url2_params.transition_type = ui::PAGE_TRANSITION_LINK;
load_url2_params.is_renderer_initiated = true;
controller.LoadURLWithParams(load_url2_params);
@@ -3148,7 +3173,7 @@ TEST_F(NavigationControllerTest, SameSubframe) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = 0;
params.url = subframe;
- params.transition = PAGE_TRANSITION_AUTO_SUBFRAME;
+ params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;
params.should_update_history = false;
params.gesture = NavigationGestureAuto;
params.is_post = false;
@@ -3256,7 +3281,7 @@ TEST_F(NavigationControllerTest, SubframeWhilePending) {
// Now start a pending load to a totally different page, but don't commit it.
const GURL url2("http://bar/");
controller.LoadURL(
- url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
// Send a subframe update from the first page, as if one had just
// automatically loaded. Auto subframes don't increment the page ID.
@@ -3264,7 +3289,7 @@ TEST_F(NavigationControllerTest, SubframeWhilePending) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = controller.GetLastCommittedEntry()->GetPageID();
params.url = url1_sub;
- params.transition = PAGE_TRANSITION_AUTO_SUBFRAME;
+ params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;
params.should_update_history = false;
params.gesture = NavigationGestureAuto;
params.is_post = false;
@@ -3527,7 +3552,7 @@ TEST_F(NavigationControllerTest, CopyStateFromAndPruneTargetPending) {
NavigationControllerImpl& other_controller = other_contents->GetController();
other_contents->NavigateAndCommit(url3);
other_controller.LoadURL(
- url4, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url4, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
other_contents->ExpectSetHistoryLengthAndPrune(
GetSiteInstanceFromEntry(other_controller.GetEntryAtIndex(0)), 1,
other_controller.GetEntryAtIndex(0)->GetPageID());
@@ -3571,7 +3596,7 @@ TEST_F(NavigationControllerTest, CopyStateFromAndPruneTargetPending2) {
other_contents->NavigateAndCommit(url2a);
// Simulate a client redirect, which has the same page ID as entry 2a.
other_controller.LoadURL(
- url2b, Referrer(), PAGE_TRANSITION_LINK, std::string());
+ url2b, Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
other_controller.GetPendingEntry()->SetPageID(
other_controller.GetLastCommittedEntry()->GetPageID());
@@ -3807,7 +3832,7 @@ TEST_F(NavigationControllerTest, CopyRestoredStateAndNavigate) {
std::vector<NavigationEntry*> entries;
for (size_t i = 0; i < arraysize(kRestoredUrls); ++i) {
NavigationEntry* entry = NavigationControllerImpl::CreateNavigationEntry(
- kRestoredUrls[i], Referrer(), PAGE_TRANSITION_RELOAD, false,
+ kRestoredUrls[i], Referrer(), ui::PAGE_TRANSITION_RELOAD, false,
std::string(), browser_context());
entry->SetPageID(static_cast<int>(i));
entries.push_back(entry);
@@ -3976,7 +4001,7 @@ TEST_F(NavigationControllerTest, PruneAllButLastCommittedForPendingNotInList) {
// Create a pending entry that is not in the entry list.
controller.LoadURL(
- url3, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url3, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
EXPECT_TRUE(controller.GetPendingEntry());
EXPECT_EQ(2, controller.GetEntryCount());
@@ -4043,7 +4068,7 @@ TEST_F(NavigationControllerTest, IsInitialNavigation) {
// After starting a new navigation, it stays false.
const GURL url2("http://foo2");
controller.LoadURL(
- url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
}
// Check that the favicon is not reused across a client redirect.
@@ -4076,7 +4101,7 @@ TEST_F(NavigationControllerTest, ClearFaviconOnRedirect) {
main_test_rfh()->SendNavigateWithTransition(
0, // same page ID.
kPageWithoutFavicon,
- PAGE_TRANSITION_CLIENT_REDIRECT);
+ ui::PAGE_TRANSITION_CLIENT_REDIRECT);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;
@@ -4118,7 +4143,7 @@ TEST_F(NavigationControllerTest, BackNavigationDoesNotClearFavicon) {
main_test_rfh()->SendNavigateWithTransition(
0,
kUrl1,
- PAGE_TRANSITION_FORWARD_BACK);
+ ui::PAGE_TRANSITION_FORWARD_BACK);
EXPECT_EQ(1U, navigation_entry_committed_counter_);
navigation_entry_committed_counter_ = 0;
@@ -4315,7 +4340,7 @@ TEST_F(NavigationControllerTest, PostThenReplaceStateThenReload) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = 1;
params.url = url;
- params.transition = PAGE_TRANSITION_FORM_SUBMIT;
+ params.transition = ui::PAGE_TRANSITION_FORM_SUBMIT;
params.gesture = NavigationGestureUser;
params.page_state = PageState::CreateFromURL(url);
params.was_within_same_page = false;
@@ -4327,7 +4352,7 @@ TEST_F(NavigationControllerTest, PostThenReplaceStateThenReload) {
GURL replace_url("http://foo#foo");
params.page_id = 1;
params.url = replace_url;
- params.transition = PAGE_TRANSITION_LINK;
+ params.transition = ui::PAGE_TRANSITION_LINK;
params.gesture = NavigationGestureUser;
params.page_state = PageState::CreateFromURL(replace_url);
params.was_within_same_page = true;
« no previous file with comments | « content/browser/frame_host/navigation_controller_impl.cc ('k') | content/browser/frame_host/navigation_entry_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698