content/browser/tab_contents/navigation_controller_unittest.cc - Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated...

Unified Diff: content/browser/tab_contents/navigation_controller_unittest.cc

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 2 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

Index: content/browser/tab_contents/navigation_controller_unittest.cc

===================================================================

--- content/browser/tab_contents/navigation_controller_unittest.cc (revision 105162)

+++ content/browser/tab_contents/navigation_controller_unittest.cc (working copy)

@@ -90,7 +90,8 @@

const GURL url1("http://foo1");

const GURL url2("http://foo2");

- controller().LoadURL(url1, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url1, GURL(), content::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());

@@ -123,7 +124,8 @@

EXPECT_EQ(contents()->GetMaxPageID(), 0);

// Load another...

- controller().LoadURL(url2, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url2, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

// The load should now be pending.

EXPECT_EQ(controller().entry_count(), 1);

@@ -164,13 +166,15 @@

const GURL url1("http://foo1");

- controller().LoadURL(url1, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url1, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

EXPECT_EQ(0U, notifications.size());

rvh()->SendNavigate(0, url1);

EXPECT_TRUE(notifications.Check1AndReset(

content::NOTIFICATION_NAV_ENTRY_COMMITTED));

- controller().LoadURL(url1, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url1, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

EXPECT_EQ(0U, notifications.size());

rvh()->SendNavigate(0, url1);

EXPECT_TRUE(notifications.Check1AndReset(

@@ -194,13 +198,15 @@

const GURL url1("http://foo1");

const GURL url2("http://foo2");

- controller().LoadURL(url1, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url1, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

EXPECT_EQ(0U, notifications.size());

rvh()->SendNavigate(0, url1);

EXPECT_TRUE(notifications.Check1AndReset(

content::NOTIFICATION_NAV_ENTRY_COMMITTED));

- controller().LoadURL(url2, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url2, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

controller().DiscardNonCommittedEntries();

EXPECT_EQ(0U, notifications.size());

@@ -223,7 +229,7 @@

// First make an existing committed entry.

const GURL kExistingURL1("http://eh");

controller().LoadURL(kExistingURL1, GURL(),

- PageTransition::TYPED, std::string());

+ content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(0, kExistingURL1);

EXPECT_TRUE(notifications.Check1AndReset(

content::NOTIFICATION_NAV_ENTRY_COMMITTED));

@@ -252,7 +258,7 @@

// First make an existing committed entry.

const GURL kExistingURL1("http://eh");

controller().LoadURL(kExistingURL1, GURL(),

- PageTransition::TYPED, std::string());

+ content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(0, kExistingURL1);

EXPECT_TRUE(notifications.Check1AndReset(

content::NOTIFICATION_NAV_ENTRY_COMMITTED));

@@ -260,7 +266,7 @@

// Make a pending entry to somewhere new.

const GURL kExistingURL2("http://bee");

controller().LoadURL(kExistingURL2, GURL(),

- PageTransition::TYPED, std::string());

+ content::PAGE_TRANSITION_TYPED, std::string());

EXPECT_EQ(0U, notifications.size());

// After the beforeunload but before it commits, do a new navigation.

@@ -287,14 +293,14 @@

// First make some history.

const GURL kExistingURL1("http://foo/eh");

controller().LoadURL(kExistingURL1, GURL(),

- PageTransition::TYPED, std::string());

+ content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(0, kExistingURL1);

EXPECT_TRUE(notifications.Check1AndReset(

content::NOTIFICATION_NAV_ENTRY_COMMITTED));

const GURL kExistingURL2("http://foo/bee");

controller().LoadURL(kExistingURL2, GURL(),

- PageTransition::TYPED, std::string());

+ content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(1, kExistingURL2);

EXPECT_TRUE(notifications.Check1AndReset(

content::NOTIFICATION_NAV_ENTRY_COMMITTED));

@@ -329,14 +335,14 @@

// First make some history.

const GURL kExistingURL1("http://foo/eh");

- controller().LoadURL(kExistingURL1, GURL(), PageTransition::TYPED,

+ controller().LoadURL(kExistingURL1, GURL(), content::PAGE_TRANSITION_TYPED,

std::string());

rvh()->SendNavigate(0, kExistingURL1);

EXPECT_TRUE(notifications.Check1AndReset(

content::NOTIFICATION_NAV_ENTRY_COMMITTED));

const GURL kExistingURL2("http://foo/bee");

- controller().LoadURL(kExistingURL2, GURL(), PageTransition::TYPED,

+ controller().LoadURL(kExistingURL2, GURL(), content::PAGE_TRANSITION_TYPED,

std::string());

rvh()->SendNavigate(1, kExistingURL2);

EXPECT_TRUE(notifications.Check1AndReset(

@@ -344,7 +350,8 @@

// Now make a pending new navigation.

const GURL kNewURL("http://foo/see");

- controller().LoadURL(kNewURL, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ kNewURL, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

EXPECT_EQ(0U, notifications.size());

EXPECT_EQ(-1, controller().pending_entry_index());

EXPECT_EQ(1, controller().last_committed_entry_index());

@@ -378,7 +385,8 @@

// Now make a pending new navigation.

const GURL kNewURL("http://eh");

- controller().LoadURL(kNewURL, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ kNewURL, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

EXPECT_EQ(0U, notifications.size());

EXPECT_EQ(-1, controller().pending_entry_index());

EXPECT_TRUE(controller().pending_entry());

@@ -414,7 +422,8 @@

// Now make a pending new navigation.

const GURL kNewURL("http://eh");

- controller().LoadURL(kNewURL, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ kNewURL, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

EXPECT_EQ(0U, notifications.size());

EXPECT_EQ(-1, controller().pending_entry_index());

EXPECT_TRUE(controller().pending_entry());

@@ -460,7 +469,8 @@

// Now make a pending new navigation.

const GURL kNewURL("http://eh");

- controller().LoadURL(kNewURL, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ kNewURL, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

EXPECT_EQ(0U, notifications.size());

EXPECT_EQ(-1, controller().pending_entry_index());

EXPECT_TRUE(controller().pending_entry());

@@ -509,7 +519,8 @@

const GURL url1("http://foo1");

- controller().LoadURL(url1, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url1, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

EXPECT_EQ(0U, notifications.size());

rvh()->SendNavigate(0, url1);

EXPECT_TRUE(notifications.Check1AndReset(

@@ -549,7 +560,8 @@

const GURL url1("http://foo1");

const GURL url2("http://foo2");

- controller().LoadURL(url1, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url1, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(0, url1);

EXPECT_TRUE(notifications.Check1AndReset(

content::NOTIFICATION_NAV_ENTRY_COMMITTED));

@@ -621,12 +633,14 @@

const GURL url2("http://foo/2");

const GURL url3("http://foo/3");

- controller().LoadURL(url1, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url1, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(0, url1);

EXPECT_TRUE(notifications.Check1AndReset(

content::NOTIFICATION_NAV_ENTRY_COMMITTED));

- controller().LoadURL(url2, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url2, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(1, url2);

EXPECT_TRUE(notifications.Check1AndReset(

content::NOTIFICATION_NAV_ENTRY_COMMITTED));

@@ -672,13 +686,14 @@

EXPECT_TRUE(notifications.Check1AndReset(

content::NOTIFICATION_NAV_ENTRY_COMMITTED));

- // controller().LoadURL(kUrl2, PageTransition::TYPED);

+ // controller().LoadURL(kUrl2, content::PAGE_TRANSITION_TYPED);

rvh()->SendNavigate(1, kUrl2);

EXPECT_TRUE(notifications.Check1AndReset(

content::NOTIFICATION_NAV_ENTRY_COMMITTED));

// Now start a new pending navigation and go back before it commits.

- controller().LoadURL(kUrl3, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ kUrl3, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

EXPECT_EQ(-1, controller().pending_entry_index());

EXPECT_EQ(kUrl3, controller().pending_entry()->url());

controller().GoBack();

@@ -839,7 +854,8 @@

const GURL url2("http://foo2"); // Redirection target

// First request

- controller().LoadURL(url1, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url1, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

EXPECT_EQ(0U, notifications.size());

rvh()->SendNavigate(0, url2);

@@ -847,7 +863,8 @@

content::NOTIFICATION_NAV_ENTRY_COMMITTED));

// Second request

- controller().LoadURL(url1, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url1, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

EXPECT_TRUE(controller().pending_entry());

EXPECT_EQ(controller().pending_entry_index(), -1);

@@ -856,7 +873,7 @@

ViewHostMsg_FrameNavigate_Params params;

params.page_id = 0;

params.url = url2;

- params.transition = PageTransition::SERVER_REDIRECT;

+ params.transition = content::PAGE_TRANSITION_SERVER_REDIRECT;

params.redirects.push_back(GURL("http://foo1"));

params.redirects.push_back(GURL("http://foo2"));

params.should_update_history = false;

@@ -894,7 +911,8 @@

const GURL url2("http://foo2"); // Redirection target

// First request as POST

- controller().LoadURL(url1, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url1, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

controller().GetActiveEntry()->set_has_post_data(true);

EXPECT_EQ(0U, notifications.size());

@@ -903,7 +921,8 @@

content::NOTIFICATION_NAV_ENTRY_COMMITTED));

// Second request

- controller().LoadURL(url1, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url1, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

EXPECT_TRUE(controller().pending_entry());

EXPECT_EQ(controller().pending_entry_index(), -1);

@@ -912,7 +931,7 @@

ViewHostMsg_FrameNavigate_Params params;

params.page_id = 0;

params.url = url2;

- params.transition = PageTransition::SERVER_REDIRECT;

+ params.transition = content::PAGE_TRANSITION_SERVER_REDIRECT;

params.redirects.push_back(GURL("http://foo1"));

params.redirects.push_back(GURL("http://foo2"));

params.should_update_history = false;

@@ -949,7 +968,8 @@

const GURL url2("http://foo2"); // Redirection target

// First request

- controller().LoadURL(url1, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url1, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

EXPECT_TRUE(controller().pending_entry());

EXPECT_EQ(controller().pending_entry_index(), -1);

@@ -958,7 +978,7 @@

ViewHostMsg_FrameNavigate_Params params;

params.page_id = 0;

params.url = url2;

- params.transition = PageTransition::SERVER_REDIRECT;

+ params.transition = content::PAGE_TRANSITION_SERVER_REDIRECT;

params.redirects.push_back(GURL("http://foo1"));

params.redirects.push_back(GURL("http://foo2"));

params.should_update_history = false;

@@ -1000,7 +1020,7 @@

ViewHostMsg_FrameNavigate_Params params;

params.page_id = 1;

params.url = url2;

- params.transition = PageTransition::MANUAL_SUBFRAME;

+ params.transition = content::PAGE_TRANSITION_MANUAL_SUBFRAME;

params.should_update_history = false;

params.gesture = NavigationGestureUser;

params.is_post = false;

@@ -1035,7 +1055,7 @@

ViewHostMsg_FrameNavigate_Params params;

params.page_id = 1;

params.url = url;

- params.transition = PageTransition::AUTO_SUBFRAME;

+ params.transition = content::PAGE_TRANSITION_AUTO_SUBFRAME;

params.should_update_history = false;

params.gesture = NavigationGestureAuto;

params.is_post = false;

@@ -1061,7 +1081,7 @@

ViewHostMsg_FrameNavigate_Params params;

params.page_id = 0;

params.url = url2;

- params.transition = PageTransition::AUTO_SUBFRAME;

+ params.transition = content::PAGE_TRANSITION_AUTO_SUBFRAME;

params.should_update_history = false;

params.gesture = NavigationGestureUser;

params.is_post = false;

@@ -1092,7 +1112,7 @@

ViewHostMsg_FrameNavigate_Params params;

params.page_id = 1;

params.url = url2;

- params.transition = PageTransition::MANUAL_SUBFRAME;

+ params.transition = content::PAGE_TRANSITION_MANUAL_SUBFRAME;

params.should_update_history = false;

params.gesture = NavigationGestureUser;

params.is_post = false;

@@ -1176,7 +1196,7 @@

ViewHostMsg_FrameNavigate_Params params;

params.page_id = 1;

params.url = url2;

- params.transition = PageTransition::LINK;

+ params.transition = content::PAGE_TRANSITION_LINK;

params.should_update_history = false;

params.gesture = NavigationGestureUser;

params.is_post = false;

@@ -1257,7 +1277,7 @@

ViewHostMsg_FrameNavigate_Params params;

params.page_id = 0; // Same page_id

params.url = url2;

- params.transition = PageTransition::LINK;

+ params.transition = content::PAGE_TRANSITION_LINK;

params.should_update_history = false;

params.gesture = NavigationGestureUser;

params.is_post = false;

@@ -1306,7 +1326,7 @@

ViewHostMsg_FrameNavigate_Params params;

params.page_id = 1; // Same page_id

params.url = url;

- params.transition = PageTransition::LINK;

+ params.transition = content::PAGE_TRANSITION_LINK;

params.redirects.push_back(url);

params.should_update_history = true;

params.gesture = NavigationGestureUnknown;

@@ -1329,7 +1349,7 @@

ViewHostMsg_FrameNavigate_Params params;

params.page_id = 2; // New page_id

params.url = url;

- params.transition = PageTransition::CLIENT_REDIRECT;

+ params.transition = content::PAGE_TRANSITION_CLIENT_REDIRECT;

params.redirects.push_back(GURL("http://foo2/#a"));

params.redirects.push_back(url);

params.should_update_history = true;

@@ -1399,7 +1419,8 @@

// Load up to the max count, all entries should be there.

for (url_index = 0; url_index < kMaxEntryCount; url_index++) {

GURL url(StringPrintf("http://www.a.com/%d", url_index));

- controller().LoadURL(url, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(url_index, url);

}

@@ -1410,7 +1431,8 @@

// Navigate some more.

GURL url(StringPrintf("http://www.a.com/%d", url_index));

- controller().LoadURL(url, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(url_index, url);

url_index++;

@@ -1427,8 +1449,9 @@

// More navigations.

for (int i = 0; i < 3; i++) {

url = GURL(StringPrintf("http:////www.a.com/%d", url_index));

- controller().LoadURL(url, GURL(), PageTransition::TYPED, std::string());

- rvh()->SendNavigate(url_index, url);

+ controller().LoadURL(

+ url, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

+ rvh()->SendNavigate(url_index, url);

url_index++;

}

EXPECT_EQ(controller().entry_count(), kMaxEntryCount);

@@ -1446,7 +1469,7 @@

GURL url("http://foo");

std::vector<NavigationEntry*> entries;

NavigationEntry* entry = NavigationController::CreateNavigationEntry(

- url, GURL(), PageTransition::RELOAD, std::string(), profile());

+ url, GURL(), content::PAGE_TRANSITION_RELOAD, std::string(), profile());

entry->set_page_id(0);

entry->set_title(ASCIIToUTF16("Title"));

entry->set_content_state("state");

@@ -1477,7 +1500,7 @@

ViewHostMsg_FrameNavigate_Params params;

params.page_id = 0;

params.url = url;

- params.transition = PageTransition::LINK;

+ params.transition = content::PAGE_TRANSITION_LINK;

params.should_update_history = false;

params.gesture = NavigationGestureUser;

params.is_post = false;

@@ -1504,7 +1527,7 @@

GURL url("http://foo");

std::vector<NavigationEntry*> entries;

NavigationEntry* entry = NavigationController::CreateNavigationEntry(

- url, GURL(), PageTransition::RELOAD, std::string(), profile());

+ url, GURL(), content::PAGE_TRANSITION_RELOAD, std::string(), profile());

entry->set_page_id(0);

entry->set_title(ASCIIToUTF16("Title"));

entry->set_content_state("state");

@@ -1550,7 +1573,7 @@

ViewHostMsg_FrameNavigate_Params params;

params.page_id = 0;

params.url = url;

- params.transition = PageTransition::LINK;

+ params.transition = content::PAGE_TRANSITION_LINK;

params.should_update_history = false;

params.gesture = NavigationGestureUser;

params.is_post = false;

@@ -1572,12 +1595,14 @@

TEST_F(NavigationControllerTest, Interstitial) {

// First navigate somewhere normal.

const GURL url1("http://foo");

- controller().LoadURL(url1, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url1, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(0, url1);

// Now navigate somewhere with an interstitial.

const GURL url2("http://bar");

- controller().LoadURL(url1, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url1, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

controller().pending_entry()->set_page_type(INTERSTITIAL_PAGE);

// At this point the interstitial will be displayed and the load will still

@@ -1598,15 +1623,20 @@

const GURL pending_url("http://foo/pending");

const GURL default_url("http://foo/default");

- controller().LoadURL(url1, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url1, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(0, url1);

- controller().LoadURL(url2, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url2, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(1, url2);

- controller().LoadURL(url3, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url3, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(2, url3);

- controller().LoadURL(url4, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url4, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(3, url4);

- controller().LoadURL(url5, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url5, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(4, url5);

// Remove the last entry.

@@ -1618,7 +1648,7 @@

EXPECT_TRUE(pending_entry && pending_entry->url() == url4);

// Add a pending entry.

- controller().LoadURL(pending_url, GURL(), PageTransition::TYPED,

+ controller().LoadURL(pending_url, GURL(), content::PAGE_TRANSITION_TYPED,

std::string());

// Now remove the last entry.

controller().RemoveEntryAtIndex(

@@ -1661,9 +1691,11 @@

const GURL url4("http://foo/4");

const GURL transient_url("http://foo/transient");

- controller().LoadURL(url0, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url0, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(0, url0);

- controller().LoadURL(url1, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url1, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(1, url1);

notifications.Reset();

@@ -1688,7 +1720,8 @@

EXPECT_EQ(contents()->GetMaxPageID(), 1);

// Navigate.

- controller().LoadURL(url2, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url2, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(2, url2);

// We should have navigated, transient entry should be gone.

@@ -1706,7 +1739,8 @@

EXPECT_EQ(controller().entry_count(), 4);

// Initiate a navigation, add a transient then commit navigation.

- controller().LoadURL(url4, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url4, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

transient_entry = new NavigationEntry;

transient_entry->set_url(transient_url);

controller().AddTransientEntry(transient_entry);

@@ -1821,7 +1855,7 @@

ViewHostMsg_FrameNavigate_Params params;

params.page_id = 0;

params.url = subframe;

- params.transition = PageTransition::AUTO_SUBFRAME;

+ params.transition = content::PAGE_TRANSITION_AUTO_SUBFRAME;

params.should_update_history = false;

params.gesture = NavigationGestureAuto;

params.is_post = false;

@@ -1878,7 +1912,8 @@

// Now start a pending load to a totally different page, but don't commit it.

const GURL url2("http://bar/");

- controller().LoadURL(url2, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url2, GURL(), content::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.

@@ -1886,7 +1921,7 @@

ViewHostMsg_FrameNavigate_Params params;

params.page_id = controller().GetLastCommittedEntry()->page_id();

params.url = url1_sub;

- params.transition = PageTransition::AUTO_SUBFRAME;

+ params.transition = content::PAGE_TRANSITION_AUTO_SUBFRAME;

params.should_update_history = false;

params.gesture = NavigationGestureAuto;

params.is_post = false;

@@ -1970,7 +2005,8 @@

scoped_ptr<TestTabContents> other_contents(CreateTestTabContents());

NavigationController& other_controller = other_contents->controller();

- other_controller.LoadURL(url3, GURL(), PageTransition::TYPED, std::string());

+ other_controller.LoadURL(

+ url3, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

other_contents->ExpectSetHistoryLengthAndPrune(NULL, 1, -1);

other_controller.CopyStateFromAndPrune(&controller());

@@ -2106,9 +2142,11 @@

const GURL url1("http://foo/1");

const GURL transient_url("http://foo/transient");

- controller().LoadURL(url0, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url0, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(0, url0);

- controller().LoadURL(url1, GURL(), PageTransition::TYPED, std::string());

+ controller().LoadURL(

+ url1, GURL(), content::PAGE_TRANSITION_TYPED, std::string());

rvh()->SendNavigate(1, url1);

// Adding a transient with no pending entry.

@@ -2248,7 +2286,7 @@

// A basic test case. Navigates to a single url, and make sure the history

// db matches.

TEST_F(NavigationControllerHistoryTest, Basic) {

- controller().LoadURL(url0, GURL(), PageTransition::LINK);

+ controller().LoadURL(url0, GURL(), content::PAGE_TRANSITION_LINK);

rvh()->SendNavigate(0, url0);

GetLastSession();

@@ -2257,7 +2295,7 @@

session_helper_.AssertTabEquals(0, 0, 1, *(windows_[0]->tabs[0]));

TabNavigation nav1(0, url0, GURL(), string16(),

webkit_glue::CreateHistoryStateForURL(url0),

- PageTransition::LINK);

+ content::PAGE_TRANSITION_LINK);

session_helper_.AssertNavigationEquals(nav1,

windows_[0]->tabs[0]->navigations[0]);

}

@@ -2279,7 +2317,7 @@

TabNavigation nav(0, url0, GURL(), string16(),

webkit_glue::CreateHistoryStateForURL(url0),

- PageTransition::LINK);

+ content::PAGE_TRANSITION_LINK);

session_helper_.AssertNavigationEquals(nav,

windows_[0]->tabs[0]->navigations[0]);

nav.set_url(url1);

@@ -2313,7 +2351,7 @@

TabNavigation nav(0, url0, GURL(), string16(),

webkit_glue::CreateHistoryStateForURL(url0),

- PageTransition::LINK);

+ content::PAGE_TRANSITION_LINK);

session_helper_.AssertNavigationEquals(nav,

windows_[0]->tabs[0]->navigations[0]);

nav.set_url(url2);

« no previous file with comments | « content/browser/tab_contents/navigation_controller.cc ('k') | content/browser/tab_contents/navigation_entry.h » ('j') | no next file with comments »