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

Unified Diff: chrome/browser/tab_contents/web_contents_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: chrome/browser/tab_contents/web_contents_unittest.cc

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

--- chrome/browser/tab_contents/web_contents_unittest.cc (revision 105162)

+++ chrome/browser/tab_contents/web_contents_unittest.cc (working copy)

@@ -103,7 +103,7 @@

void TestDidNavigate(int page_id, const GURL& url) {

ViewHostMsg_FrameNavigate_Params params;

- InitNavigateParams(&params, page_id, url, PageTransition::TYPED);

+ InitNavigateParams(&params, page_id, url, content::PAGE_TRANSITION_TYPED);

DidNavigate(render_view_host(), params);

}

@@ -205,7 +205,7 @@

TEST_F(TabContentsTest, UpdateTitle) {

ViewHostMsg_FrameNavigate_Params params;

InitNavigateParams(&params, 0, GURL(chrome::kAboutBlankURL),

- PageTransition::TYPED);

+ content::PAGE_TRANSITION_TYPED);

content::LoadCommittedDetails details;

controller().RendererDidNavigate(params, &details);

@@ -222,14 +222,15 @@

process()->sink().ClearMessages();

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

+ controller().LoadURL(

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

rvh()->delegate()->RenderViewCreated(rvh());

// Did we get the expected message?

EXPECT_TRUE(process()->sink().GetFirstMessageMatching(

ViewMsg_EnableViewSourceMode::ID));

ViewHostMsg_FrameNavigate_Params params;

- InitNavigateParams(&params, 0, kGURL, PageTransition::TYPED);

+ InitNavigateParams(&params, 0, kGURL, content::PAGE_TRANSITION_TYPED);

content::LoadCommittedDetails details;

controller().RendererDidNavigate(params, &details);

// Also check title and url.

@@ -244,7 +245,8 @@

// Navigate to URL

const GURL url("http://www.google.com");

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

+ controller().LoadURL(

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

EXPECT_FALSE(contents()->cross_navigation_pending());

EXPECT_EQ(instance1, orig_rvh->site_instance());

// Controller's pending entry will have a NULL site instance until we assign

@@ -253,7 +255,7 @@

// DidNavigate from the page

ViewHostMsg_FrameNavigate_Params params;

- InitNavigateParams(&params, 1, url, PageTransition::TYPED);

+ InitNavigateParams(&params, 1, url, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(orig_rvh, params);

EXPECT_FALSE(contents()->cross_navigation_pending());

EXPECT_EQ(orig_rvh, contents()->render_view_host());

@@ -269,7 +271,8 @@

const GURL url(std::string("http://example.org/").append(

content::kMaxURLChars + 1, 'a'));

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

+ controller().LoadURL(

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

EXPECT_TRUE(controller().GetActiveEntry() == NULL);

}

@@ -284,9 +287,10 @@

// Navigate to URL. First URL should use first RenderViewHost.

const GURL url("http://www.google.com");

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

+ controller().LoadURL(

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

ViewHostMsg_FrameNavigate_Params params1;

- InitNavigateParams(&params1, 1, url, PageTransition::TYPED);

+ InitNavigateParams(&params1, 1, url, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(orig_rvh, params1);

EXPECT_FALSE(contents()->cross_navigation_pending());

@@ -294,7 +298,8 @@

// Navigate to new site

const GURL url2("http://www.yahoo.com");

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

+ controller().LoadURL(

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

EXPECT_TRUE(contents()->cross_navigation_pending());

TestRenderViewHost* pending_rvh = contents()->pending_rvh();

int pending_rvh_delete_count = 0;

@@ -307,7 +312,7 @@

// DidNavigate from the pending page

ViewHostMsg_FrameNavigate_Params params2;

- InitNavigateParams(&params2, 1, url2, PageTransition::TYPED);

+ InitNavigateParams(&params2, 1, url2, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(pending_rvh, params2);

SiteInstance* instance2 = contents()->GetSiteInstance();

@@ -359,9 +364,10 @@

// Navigate to URL. First URL should use first RenderViewHost.

const GURL url("http://www.google.com");

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

+ controller().LoadURL(

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

ViewHostMsg_FrameNavigate_Params params1;

- InitNavigateParams(&params1, 1, url, PageTransition::TYPED);

+ InitNavigateParams(&params1, 1, url, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(orig_rvh, params1);

EXPECT_FALSE(contents()->cross_navigation_pending());

@@ -372,7 +378,8 @@

// Navigate to new site. We should not go into PENDING.

const GURL url2("http://www.yahoo.com");

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

+ controller().LoadURL(

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

TestRenderViewHost* new_rvh = rvh();

EXPECT_FALSE(contents()->cross_navigation_pending());

EXPECT_TRUE(contents()->pending_rvh() == NULL);

@@ -381,7 +388,7 @@

// DidNavigate from the new page

ViewHostMsg_FrameNavigate_Params params2;

- InitNavigateParams(&params2, 1, url2, PageTransition::TYPED);

+ InitNavigateParams(&params2, 1, url2, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(new_rvh, params2);

SiteInstance* instance2 = contents()->GetSiteInstance();

@@ -404,9 +411,10 @@

// Navigate to URL. First URL should use first RenderViewHost.

const GURL url("http://www.google.com");

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

+ controller().LoadURL(

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

ViewHostMsg_FrameNavigate_Params params1;

- InitNavigateParams(&params1, 1, url, PageTransition::TYPED);

+ InitNavigateParams(&params1, 1, url, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(orig_rvh, params1);

// Open a new tab with the same SiteInstance, navigated to the same site.

@@ -415,24 +423,25 @@

// is the scope of page IDs) and we want to consider

// this a new page.

contents2.transition_cross_site = true;

- contents2.controller().LoadURL(url, GURL(), PageTransition::TYPED,

+ contents2.controller().LoadURL(url, GURL(), content::PAGE_TRANSITION_TYPED,

std::string());

contents2.TestDidNavigate(contents2.render_view_host(), params1);

// Navigate first tab to a new site

const GURL url2a("http://www.yahoo.com");

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

+ controller().LoadURL(

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

orig_rvh->SendShouldCloseACK(true);

TestRenderViewHost* pending_rvh_a = contents()->pending_rvh();

ViewHostMsg_FrameNavigate_Params params2a;

- InitNavigateParams(&params2a, 1, url2a, PageTransition::TYPED);

+ InitNavigateParams(&params2a, 1, url2a, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(pending_rvh_a, params2a);

SiteInstance* instance2a = contents()->GetSiteInstance();

EXPECT_NE(instance1, instance2a);

// Navigate second tab to the same site as the first tab

const GURL url2b("http://mail.yahoo.com");

- contents2.controller().LoadURL(url2b, GURL(), PageTransition::TYPED,

+ contents2.controller().LoadURL(url2b, GURL(), content::PAGE_TRANSITION_TYPED,

std::string());

TestRenderViewHost* rvh2 =

static_cast<TestRenderViewHost*>(contents2.render_view_host());

@@ -446,7 +455,7 @@

// now covered by the CrossSiteBoundariesAfterCrash test.

ViewHostMsg_FrameNavigate_Params params2b;

- InitNavigateParams(&params2b, 2, url2b, PageTransition::TYPED);

+ InitNavigateParams(&params2b, 2, url2b, content::PAGE_TRANSITION_TYPED);

contents2.TestDidNavigate(pending_rvh_b, params2b);

SiteInstance* instance2b = contents2.GetSiteInstance();

EXPECT_NE(instance1, instance2b);

@@ -464,16 +473,17 @@

// Navigate to URL.

const GURL url("http://www.google.com");

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

+ controller().LoadURL(

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

ViewHostMsg_FrameNavigate_Params params1;

- InitNavigateParams(&params1, 1, url, PageTransition::TYPED);

+ InitNavigateParams(&params1, 1, url, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(orig_rvh, params1);

// Open a related tab to a second site.

TestTabContents contents2(profile(), instance1);

contents2.transition_cross_site = true;

const GURL url2("http://www.yahoo.com");

- contents2.controller().LoadURL(url2, GURL(), PageTransition::TYPED,

+ contents2.controller().LoadURL(url2, GURL(), content::PAGE_TRANSITION_TYPED,

std::string());

// The first RVH in contents2 isn't live yet, so we shortcut the cross site

// pending.

@@ -481,7 +491,7 @@

contents2.render_view_host());

EXPECT_FALSE(contents2.cross_navigation_pending());

ViewHostMsg_FrameNavigate_Params params2;

- InitNavigateParams(&params2, 2, url2, PageTransition::TYPED);

+ InitNavigateParams(&params2, 2, url2, content::PAGE_TRANSITION_TYPED);

contents2.TestDidNavigate(rvh2, params2);

SiteInstance* instance2 = contents2.GetSiteInstance();

EXPECT_NE(instance1, instance2);

@@ -490,7 +500,7 @@

// Simulate a link click in first tab to second site. Doesn't switch

// SiteInstances, because we don't intercept WebKit navigations.

ViewHostMsg_FrameNavigate_Params params3;

- InitNavigateParams(&params3, 2, url2, PageTransition::TYPED);

+ InitNavigateParams(&params3, 2, url2, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(orig_rvh, params3);

SiteInstance* instance3 = contents()->GetSiteInstance();

EXPECT_EQ(instance1, instance3);

@@ -499,10 +509,11 @@

// Navigate to the new site. Doesn't switch SiteInstancees, because we

// compare against the current URL, not the SiteInstance's site.

const GURL url3("http://mail.yahoo.com");

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

+ controller().LoadURL(

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

EXPECT_FALSE(contents()->cross_navigation_pending());

ViewHostMsg_FrameNavigate_Params params4;

- InitNavigateParams(&params4, 3, url3, PageTransition::TYPED);

+ InitNavigateParams(&params4, 3, url3, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(orig_rvh, params4);

SiteInstance* instance4 = contents()->GetSiteInstance();

EXPECT_EQ(instance1, instance4);

@@ -517,16 +528,18 @@

// Navigate to URL. First URL should use first RenderViewHost.

const GURL url("http://www.google.com");

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

+ controller().LoadURL(

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

ViewHostMsg_FrameNavigate_Params params1;

- InitNavigateParams(&params1, 1, url, PageTransition::TYPED);

+ InitNavigateParams(&params1, 1, url, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(orig_rvh, params1);

EXPECT_FALSE(contents()->cross_navigation_pending());

EXPECT_EQ(orig_rvh, contents()->render_view_host());

// Navigate to new site, but simulate an onbeforeunload denial.

const GURL url2("http://www.yahoo.com");

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

+ controller().LoadURL(

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

EXPECT_TRUE(orig_rvh->is_waiting_for_beforeunload_ack());

orig_rvh->TestOnMessageReceived(ViewHostMsg_ShouldClose_ACK(0, false));

EXPECT_FALSE(orig_rvh->is_waiting_for_beforeunload_ack());

@@ -534,7 +547,8 @@

EXPECT_EQ(orig_rvh, contents()->render_view_host());

// Navigate again, but simulate an onbeforeunload approval.

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

+ controller().LoadURL(

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

EXPECT_TRUE(orig_rvh->is_waiting_for_beforeunload_ack());

orig_rvh->TestOnMessageReceived(ViewHostMsg_ShouldClose_ACK(0, true));

EXPECT_FALSE(orig_rvh->is_waiting_for_beforeunload_ack());

@@ -548,7 +562,7 @@

// DidNavigate from the pending page

ViewHostMsg_FrameNavigate_Params params2;

- InitNavigateParams(&params2, 1, url2, PageTransition::TYPED);

+ InitNavigateParams(&params2, 1, url2, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(pending_rvh, params2);

SiteInstance* instance2 = contents()->GetSiteInstance();

EXPECT_FALSE(contents()->cross_navigation_pending());

@@ -567,16 +581,18 @@

// Navigate to URL. First URL should use first RenderViewHost.

const GURL url("http://www.google.com");

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

+ controller().LoadURL(

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

ViewHostMsg_FrameNavigate_Params params1;

- InitNavigateParams(&params1, 1, url, PageTransition::TYPED);

+ InitNavigateParams(&params1, 1, url, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(orig_rvh, params1);

EXPECT_FALSE(contents()->cross_navigation_pending());

EXPECT_EQ(orig_rvh, contents()->render_view_host());

// Navigate to new site, simulating an onbeforeunload approval.

const GURL url2("http://www.yahoo.com");

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

+ controller().LoadURL(

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

EXPECT_TRUE(orig_rvh->is_waiting_for_beforeunload_ack());

orig_rvh->TestOnMessageReceived(ViewHostMsg_ShouldClose_ACK(0, true));

EXPECT_TRUE(contents()->cross_navigation_pending());

@@ -598,10 +614,11 @@

// Start with NTP, which gets a new RVH with WebUI bindings.

const GURL url1("chrome://newtab");

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

+ controller().LoadURL(

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

TestRenderViewHost* ntp_rvh = rvh();

ViewHostMsg_FrameNavigate_Params params1;

- InitNavigateParams(&params1, 1, url1, PageTransition::TYPED);

+ InitNavigateParams(&params1, 1, url1, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(ntp_rvh, params1);

NavigationEntry* entry1 = controller().GetLastCommittedEntry();

SiteInstance* instance1 = contents()->GetSiteInstance();

@@ -614,7 +631,8 @@

// Navigate to new site.

const GURL url2("http://www.google.com");

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

+ controller().LoadURL(

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

EXPECT_TRUE(contents()->cross_navigation_pending());

TestRenderViewHost* google_rvh = contents()->pending_rvh();

@@ -624,7 +642,7 @@

// DidNavigate from the pending page.

ViewHostMsg_FrameNavigate_Params params2;

- InitNavigateParams(&params2, 1, url2, PageTransition::TYPED);

+ InitNavigateParams(&params2, 1, url2, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(google_rvh, params2);

NavigationEntry* entry2 = controller().GetLastCommittedEntry();

SiteInstance* instance2 = contents()->GetSiteInstance();

@@ -640,10 +658,11 @@

// Navigate to third page on same site.

const GURL url3("http://news.google.com");

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

+ controller().LoadURL(

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

EXPECT_FALSE(contents()->cross_navigation_pending());

ViewHostMsg_FrameNavigate_Params params3;

- InitNavigateParams(&params3, 2, url3, PageTransition::TYPED);

+ InitNavigateParams(&params3, 2, url3, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(google_rvh, params3);

NavigationEntry* entry3 = controller().GetLastCommittedEntry();

SiteInstance* instance3 = contents()->GetSiteInstance();

@@ -694,21 +713,23 @@

// Navigate to URL. First URL should use first RenderViewHost.

const GURL url("http://www.google.com");

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

+ controller().LoadURL(

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

ViewHostMsg_FrameNavigate_Params params1;

- InitNavigateParams(&params1, 1, url, PageTransition::TYPED);

+ InitNavigateParams(&params1, 1, url, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(orig_rvh, params1);

EXPECT_FALSE(contents()->cross_navigation_pending());

EXPECT_EQ(orig_rvh, contents()->render_view_host());

// Start navigating to new site.

const GURL url2("http://www.yahoo.com");

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

+ controller().LoadURL(

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

// Simulate a sub-frame navigation arriving and ensure the RVH is still

// waiting for a before unload response.

orig_rvh->SendNavigateWithTransition(1, GURL("http://google.com/frame"),

- PageTransition::AUTO_SUBFRAME);

+ content::PAGE_TRANSITION_AUTO_SUBFRAME);

EXPECT_TRUE(orig_rvh->is_waiting_for_beforeunload_ack());

// Now simulate the onbeforeunload approval and verify the navigation is

@@ -727,13 +748,15 @@

// Navigate to NTP URL.

const GURL url("chrome://newtab");

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

+ controller().LoadURL(

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

TestRenderViewHost* orig_rvh = rvh();

EXPECT_FALSE(contents()->cross_navigation_pending());

// Navigate to new site, with the beforeunload request in flight.

const GURL url2("http://www.yahoo.com");

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

+ controller().LoadURL(

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

TestRenderViewHost* pending_rvh = contents()->pending_rvh();

EXPECT_TRUE(contents()->cross_navigation_pending());

EXPECT_TRUE(orig_rvh->is_waiting_for_beforeunload_ack());

@@ -748,7 +771,7 @@

// The pending navigation should be able to commit successfully.

ViewHostMsg_FrameNavigate_Params params2;

- InitNavigateParams(&params2, 1, url2, PageTransition::TYPED);

+ InitNavigateParams(&params2, 1, url2, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(pending_rvh, params2);

EXPECT_FALSE(contents()->cross_navigation_pending());

EXPECT_EQ(pending_rvh, contents()->render_view_host());

@@ -765,16 +788,18 @@

// Navigate to URL. First URL should use first RenderViewHost.

const GURL url("http://www.google.com");

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

+ controller().LoadURL(

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

ViewHostMsg_FrameNavigate_Params params1;

- InitNavigateParams(&params1, 1, url, PageTransition::TYPED);

+ InitNavigateParams(&params1, 1, url, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(orig_rvh, params1);

EXPECT_FALSE(contents()->cross_navigation_pending());

EXPECT_EQ(orig_rvh, contents()->render_view_host());

// Navigate to new site, simulating an onbeforeunload approval.

const GURL url2("http://www.yahoo.com");

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

+ controller().LoadURL(

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

orig_rvh->TestOnMessageReceived(ViewHostMsg_ShouldClose_ACK(0, true));

EXPECT_TRUE(contents()->cross_navigation_pending());

TestRenderViewHost* pending_rvh = static_cast<TestRenderViewHost*>(

@@ -790,7 +815,7 @@

// responding to navigation requests. (See bug 23942.)

ViewHostMsg_FrameNavigate_Params params1a;

InitNavigateParams(&params1a, 2, GURL("http://www.google.com/foo"),

- PageTransition::TYPED);

+ content::PAGE_TRANSITION_TYPED);

orig_rvh->SendNavigate(2, GURL("http://www.google.com/foo"));

// Verify that the pending navigation is still in progress.

@@ -799,7 +824,7 @@

// DidNavigate from the pending page should commit it.

ViewHostMsg_FrameNavigate_Params params2;

- InitNavigateParams(&params2, 1, url2, PageTransition::TYPED);

+ InitNavigateParams(&params2, 1, url2, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(pending_rvh, params2);

SiteInstance* instance2 = contents()->GetSiteInstance();

EXPECT_FALSE(contents()->cross_navigation_pending());

@@ -817,16 +842,18 @@

// Navigate to URL. First URL should use first RenderViewHost.

const GURL url("http://www.google.com");

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

+ controller().LoadURL(

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

ViewHostMsg_FrameNavigate_Params params1;

- InitNavigateParams(&params1, 1, url, PageTransition::TYPED);

+ InitNavigateParams(&params1, 1, url, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(orig_rvh, params1);

EXPECT_FALSE(contents()->cross_navigation_pending());

EXPECT_EQ(orig_rvh, contents()->render_view_host());

// Navigate to new site, simulating an onbeforeunload approval.

const GURL url2("http://www.yahoo.com");

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

+ controller().LoadURL(

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

EXPECT_TRUE(orig_rvh->is_waiting_for_beforeunload_ack());

orig_rvh->TestOnMessageReceived(ViewHostMsg_ShouldClose_ACK(0, true));

EXPECT_TRUE(contents()->cross_navigation_pending());

@@ -836,7 +863,8 @@

// Suppose the navigation doesn't get a chance to commit, and the user

// navigates in the current RVH's SiteInstance.

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

+ controller().LoadURL(

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

// Verify that the pending navigation is cancelled and the renderer is no

// longer swapped out.

@@ -856,26 +884,28 @@

// Navigate to URL. There should be no committed entry yet.

const GURL url("http://www.google.com");

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

+ controller().LoadURL(

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

NavigationEntry* entry = controller().GetLastCommittedEntry();

EXPECT_TRUE(entry == NULL);

// Committed entry should have content state after DidNavigate.

ViewHostMsg_FrameNavigate_Params params1;

- InitNavigateParams(&params1, 1, url, PageTransition::TYPED);

+ InitNavigateParams(&params1, 1, url, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(orig_rvh, params1);

entry = controller().GetLastCommittedEntry();

EXPECT_FALSE(entry->content_state().empty());

// Navigate to same site.

const GURL url2("http://images.google.com");

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

+ controller().LoadURL(

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

entry = controller().GetLastCommittedEntry();

EXPECT_FALSE(entry->content_state().empty());

// Committed entry should have content state after DidNavigate.

ViewHostMsg_FrameNavigate_Params params2;

- InitNavigateParams(&params2, 2, url2, PageTransition::TYPED);

+ InitNavigateParams(&params2, 2, url2, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(orig_rvh, params2);

entry = controller().GetLastCommittedEntry();

EXPECT_FALSE(entry->content_state().empty());

@@ -896,7 +926,7 @@

// Currently, this results in two DidNavigate events.

const GURL url(chrome::kAboutBlankURL);

ViewHostMsg_FrameNavigate_Params params1;

- InitNavigateParams(&params1, 1, url, PageTransition::TYPED);

+ InitNavigateParams(&params1, 1, url, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(orig_rvh, params1);

@@ -944,7 +974,7 @@

// Initiate a browser navigation that will trigger the interstitial

controller().LoadURL(GURL("http://www.evil.com"), GURL(),

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

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

// Show an interstitial.

TestInterstitialPage::InterstitialState state =

@@ -1081,7 +1111,7 @@

// Initiate a browser navigation that will trigger the interstitial

controller().LoadURL(GURL("http://www.evil.com"), GURL(),

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

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

// Show an interstitial.

TestInterstitialPage::InterstitialState state =

@@ -1523,7 +1553,8 @@

// Let's simulate a navigation initiated from the browser before the

// interstitial finishes loading.

const GURL url("http://www.google.com");

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

+ controller().LoadURL(

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

ASSERT_FALSE(deleted);

EXPECT_FALSE(interstitial->is_showing());

@@ -1613,8 +1644,8 @@

const GURL kGURL(kUrl);

// Start a navigation to a page

- contents()->controller().LoadURL(kGURL, GURL(), PageTransition::TYPED,

- std::string());

+ contents()->controller().LoadURL(

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

// Simulate that navigation triggering an interstitial.

TestInterstitialPage::InterstitialState state =

@@ -1628,8 +1659,8 @@

// Initiate a new navigation from the browser that also triggers an

// interstitial.

- contents()->controller().LoadURL(kGURL, GURL(), PageTransition::TYPED,

- std::string());

+ contents()->controller().LoadURL(

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

TestInterstitialPage::InterstitialState state2 =

TestInterstitialPage::UNDECIDED;

bool deleted2 = false;

@@ -1658,11 +1689,11 @@

const GURL kGURL(kUrl);

// Start a navigation to a page

- contents()->controller().LoadURL(kGURL, GURL(), PageTransition::TYPED,

- std::string());

+ contents()->controller().LoadURL(

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

// DidNavigate from the page

ViewHostMsg_FrameNavigate_Params params;

- InitNavigateParams(&params, 1, kGURL, PageTransition::TYPED);

+ InitNavigateParams(&params, 1, kGURL, content::PAGE_TRANSITION_TYPED);

contents()->TestDidNavigate(rvh(), params);

// Simulate showing an interstitial while the page is showing.

@@ -1696,7 +1727,7 @@

// Initiate a browser navigation that will trigger the interstitial

controller().LoadURL(GURL("http://www.evil.com"), GURL(),

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

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

// Show an interstitial.

TestInterstitialPage::InterstitialState state =

« no previous file with comments | « chrome/browser/tab_contents/render_view_context_menu.cc ('k') | chrome/browser/tab_contents/web_drop_target_win.cc » ('j') | no next file with comments »