content/browser/web_contents/web_contents_impl_unittest.cc - Issue 11231077: Move a bunch more code into the content namespace.

Unified Diff: content/browser/web_contents/web_contents_impl_unittest.cc

Issue 11231077: Move a bunch more code into the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 8 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

« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | content/browser/web_contents/web_contents_view_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_impl_unittest.cc

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

--- content/browser/web_contents/web_contents_impl_unittest.cc (revision 163514)

+++ content/browser/web_contents/web_contents_impl_unittest.cc (working copy)

@@ -30,31 +30,15 @@

#include "testing/gtest/include/gtest/gtest.h"

#include "webkit/glue/webkit_glue.h"

-using content::BrowserContext;

-using content::BrowserThread;

-using content::InterstitialPage;

-using content::MockRenderProcessHost;

-using content::NavigationEntry;

-using content::NavigationEntryImpl;

-using content::PasswordForm;

-using content::SiteInstance;

-using content::RenderViewHost;

-using content::RenderViewHostImplTestHarness;

-using content::TestBrowserThread;

-using content::TestRenderViewHost;

-using content::TestWebContents;

-using content::WebContents;

-using content::WebUI;

-using content::WebUIController;

+namespace content {

namespace {

class WebContentsImplTestWebUIControllerFactory

- : public content::WebUIControllerFactory {

+ : public WebUIControllerFactory {

public:

virtual WebUIController* CreateWebUIControllerForURL(

- content::WebUI* web_ui, const GURL& url) const OVERRIDE {

- if (!content::GetContentClient()->HasWebUIScheme(url))

+ WebUI* web_ui, const GURL& url) const OVERRIDE {

+ if (!GetContentClient()->HasWebUIScheme(url))

return NULL;

return new WebUIController(web_ui);

@@ -67,19 +51,19 @@

virtual bool UseWebUIForURL(BrowserContext* browser_context,

const GURL& url) const OVERRIDE {

- return content::GetContentClient()->HasWebUIScheme(url);

+ return GetContentClient()->HasWebUIScheme(url);

}

virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context,

const GURL& url) const OVERRIDE {

- return content::GetContentClient()->HasWebUIScheme(url);

+ return GetContentClient()->HasWebUIScheme(url);

}

virtual bool IsURLAcceptableForWebUI(

BrowserContext* browser_context,

const GURL& url,

bool data_urls_allowed) const {

- return content::GetContentClient()->HasWebUIScheme(url);

+ return GetContentClient()->HasWebUIScheme(url);

}

};

@@ -93,14 +77,12 @@

}

};

-class WebContentsImplTestBrowserClient

- : public content::TestContentBrowserClient {

+class WebContentsImplTestBrowserClient : public TestContentBrowserClient {

public:

WebContentsImplTestBrowserClient() {

}

- virtual content::WebUIControllerFactory*

- GetWebUIControllerFactory() OVERRIDE {

+ virtual WebUIControllerFactory* GetWebUIControllerFactory() OVERRIDE {

return &factory_;

}

@@ -110,7 +92,7 @@

class TestInterstitialPage;

-class TestInterstitialPageDelegate : public content::InterstitialPageDelegate {

+class TestInterstitialPageDelegate : public InterstitialPageDelegate {

public:

TestInterstitialPageDelegate(TestInterstitialPage* interstitial_page)

: interstitial_page_(interstitial_page) {}

@@ -191,7 +173,7 @@

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

ViewHostMsg_FrameNavigate_Params params;

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

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

DidNavigate(GetRenderViewHostForTesting(), params);

}

@@ -200,7 +182,7 @@

}

bool is_showing() const {

- return static_cast<content::TestRenderWidgetHostView*>(

+ return static_cast<TestRenderWidgetHostView*>(

GetRenderViewHostForTesting()->GetView())->is_showing();

}

@@ -219,13 +201,13 @@

}

protected:

- virtual content::RenderViewHost* CreateRenderViewHost() OVERRIDE {

+ virtual RenderViewHost* CreateRenderViewHost() OVERRIDE {

return new TestRenderViewHost(

SiteInstance::Create(web_contents()->GetBrowserContext()),

this, this, MSG_ROUTING_NONE, false);

}

- virtual content::WebContentsView* CreateWebContentsView() OVERRIDE {

+ virtual WebContentsView* CreateWebContentsView() OVERRIDE {

return NULL;

}

@@ -286,24 +268,24 @@

// We must register it similarly to kChromeUIScheme.

url_util::AddStandardScheme("webcontentsimpltest");

- old_client_ = content::GetContentClient();

- old_browser_client_ = content::GetContentClient()->browser();

- content::SetContentClient(&client_);

- content::GetContentClient()->set_browser_for_testing(&browser_client_);

+ old_client_ = GetContentClient();

+ old_browser_client_ = GetContentClient()->browser();

+ SetContentClient(&client_);

+ GetContentClient()->set_browser_for_testing(&browser_client_);

RenderViewHostImplTestHarness::SetUp();

}

virtual void TearDown() {

- content::GetContentClient()->set_browser_for_testing(old_browser_client_);

- content::SetContentClient(old_client_);

+ GetContentClient()->set_browser_for_testing(old_browser_client_);

+ SetContentClient(old_client_);

RenderViewHostImplTestHarness::TearDown();

}

private:

WebContentsImplTestContentClient client_;

WebContentsImplTestBrowserClient browser_client_;

- content::ContentClient* old_client_;

- content::ContentBrowserClient* old_browser_client_;

+ ContentClient* old_client_;

+ ContentBrowserClient* old_browser_client_;

TestBrowserThread ui_thread_;

TestBrowserThread file_user_blocking_thread_;

TestBrowserThread io_thread_;

@@ -317,9 +299,9 @@

static_cast<NavigationControllerImpl&>(controller());

ViewHostMsg_FrameNavigate_Params params;

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

- content::PAGE_TRANSITION_TYPED);

+ PAGE_TRANSITION_TYPED);

- content::LoadCommittedDetails details;

+ LoadCommittedDetails details;

cont.RendererDidNavigate(params, &details);

contents()->UpdateTitle(rvh(), 0, ASCIIToUTF16(" Lots O' Whitespace\n"),

@@ -337,16 +319,15 @@

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

cont.LoadURL(

- kGURL, content::Referrer(), content::PAGE_TRANSITION_TYPED,

- std::string());

+ kGURL, Referrer(), PAGE_TRANSITION_TYPED, std::string());

rvh()->GetDelegate()->RenderViewCreated(rvh());

// Did we get the expected message?

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

ViewMsg_EnableViewSourceMode::ID));

ViewHostMsg_FrameNavigate_Params params;

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

- content::LoadCommittedDetails details;

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

+ LoadCommittedDetails details;

cont.RendererDidNavigate(params, &details);

// Also check title and url.

EXPECT_EQ(ASCIIToUTF16(kUrl), contents()->GetTitle());

@@ -384,7 +365,7 @@

// Navigate to URL

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

controller().LoadURL(

- url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ url, Referrer(), PAGE_TRANSITION_TYPED, std::string());

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

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

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

@@ -394,7 +375,7 @@

site_instance() == NULL);

// DidNavigate from the page

- contents()->TestDidNavigate(orig_rvh, 1, url, content::PAGE_TRANSITION_TYPED);

+ contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED);

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

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

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

@@ -406,15 +387,14 @@

site_instance());

}

-// Test that we reject NavigateToEntry if the url is over content::kMaxURLChars.

+// Test that we reject NavigateToEntry if the url is over kMaxURLChars.

TEST_F(WebContentsImplTest, NavigateToExcessivelyLongURL) {

// Construct a URL that's kMaxURLChars + 1 long of all 'a's.

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

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

+ kMaxURLChars + 1, 'a'));

controller().LoadURL(

- url, content::Referrer(), content::PAGE_TRANSITION_GENERATED,

- std::string());

+ url, Referrer(), PAGE_TRANSITION_GENERATED, std::string());

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

}

@@ -430,8 +410,8 @@

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

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

controller().LoadURL(

- url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

- contents()->TestDidNavigate(orig_rvh, 1, url, content::PAGE_TRANSITION_TYPED);

+ url, Referrer(), PAGE_TRANSITION_TYPED, std::string());

+ contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED);

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

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

@@ -439,7 +419,7 @@

// Navigate to new site

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

controller().LoadURL(

- url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());

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

TestRenderViewHost* pending_rvh =

static_cast<TestRenderViewHost*>(contents()->GetPendingRenderViewHost());

@@ -453,7 +433,7 @@

// DidNavigate from the pending page

contents()->TestDidNavigate(

- pending_rvh, 1, url2, content::PAGE_TRANSITION_TYPED);

+ pending_rvh, 1, url2, PAGE_TRANSITION_TYPED);

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

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

@@ -480,7 +460,7 @@

// DidNavigate from the back action

contents()->TestDidNavigate(

- goback_rvh, 1, url2, content::PAGE_TRANSITION_TYPED);

+ goback_rvh, 1, url2, PAGE_TRANSITION_TYPED);

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

EXPECT_EQ(goback_rvh, contents()->GetRenderViewHost());

EXPECT_EQ(instance1, contents()->GetSiteInstance());

@@ -507,8 +487,8 @@

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

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

controller().LoadURL(

- url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

- contents()->TestDidNavigate(orig_rvh, 1, url, content::PAGE_TRANSITION_TYPED);

+ url, Referrer(), PAGE_TRANSITION_TYPED, std::string());

+ contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED);

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

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

@@ -519,7 +499,7 @@

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

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

controller().LoadURL(

- url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());

RenderViewHost* new_rvh = rvh();

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

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

@@ -527,7 +507,7 @@

EXPECT_EQ(orig_rvh_delete_count, 1);

// DidNavigate from the new page

- contents()->TestDidNavigate(new_rvh, 1, url2, content::PAGE_TRANSITION_TYPED);

+ contents()->TestDidNavigate(new_rvh, 1, url2, PAGE_TRANSITION_TYPED);

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

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

@@ -551,38 +531,37 @@

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

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

controller().LoadURL(

- url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

- contents()->TestDidNavigate(orig_rvh, 1, url, content::PAGE_TRANSITION_TYPED);

+ url, Referrer(), PAGE_TRANSITION_TYPED, std::string());

+ contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED);

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

scoped_ptr<TestWebContents> contents2(

TestWebContents::Create(browser_context_.get(), instance1));

contents2->transition_cross_site = true;

- contents2->GetController().LoadURL(url, content::Referrer(),

- content::PAGE_TRANSITION_TYPED,

+ contents2->GetController().LoadURL(url, Referrer(),

+ PAGE_TRANSITION_TYPED,

std::string());

// Need this page id to be 2 since the site instance is the same (which is the

// scope of page IDs) and we want to consider this a new page.

contents2->TestDidNavigate(

- contents2->GetRenderViewHost(), 2, url, content::PAGE_TRANSITION_TYPED);

+ contents2->GetRenderViewHost(), 2, url, PAGE_TRANSITION_TYPED);

// Navigate first contents to a new site.

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

controller().LoadURL(

- url2a, content::Referrer(), content::PAGE_TRANSITION_TYPED,

- std::string());

+ url2a, Referrer(), PAGE_TRANSITION_TYPED, std::string());

orig_rvh->SendShouldCloseACK(true);

TestRenderViewHost* pending_rvh_a =

static_cast<TestRenderViewHost*>(contents()->GetPendingRenderViewHost());

contents()->TestDidNavigate(

- pending_rvh_a, 1, url2a, content::PAGE_TRANSITION_TYPED);

+ pending_rvh_a, 1, url2a, PAGE_TRANSITION_TYPED);

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

EXPECT_NE(instance1, instance2a);

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

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

- contents2->GetController().LoadURL(url2b, content::Referrer(),

- content::PAGE_TRANSITION_TYPED,

+ contents2->GetController().LoadURL(url2b, Referrer(),

+ PAGE_TRANSITION_TYPED,

std::string());

TestRenderViewHost* rvh2 =

static_cast<TestRenderViewHost*>(contents2->GetRenderViewHost());

@@ -596,7 +575,7 @@

// second contents hadn't navigated somewhere first (bug 1145430). That case

// is now covered by the CrossSiteBoundariesAfterCrash test.

contents2->TestDidNavigate(

- pending_rvh_b, 2, url2b, content::PAGE_TRANSITION_TYPED);

+ pending_rvh_b, 2, url2b, PAGE_TRANSITION_TYPED);

SiteInstance* instance2b = contents2->GetSiteInstance();

EXPECT_NE(instance1, instance2b);

@@ -614,24 +593,24 @@

// Navigate to URL.

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

controller().LoadURL(

- url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ url, Referrer(), PAGE_TRANSITION_TYPED, std::string());

contents()->TestDidNavigate(

- orig_rvh, 1, url, content::PAGE_TRANSITION_TYPED);

+ orig_rvh, 1, url, PAGE_TRANSITION_TYPED);

// Open a related contents to a second site.

scoped_ptr<TestWebContents> contents2(

TestWebContents::Create(browser_context_.get(), instance1));

contents2->transition_cross_site = true;

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

- contents2->GetController().LoadURL(url2, content::Referrer(),

- content::PAGE_TRANSITION_TYPED,

+ contents2->GetController().LoadURL(url2, Referrer(),

+ PAGE_TRANSITION_TYPED,

std::string());

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

// pending.

TestRenderViewHost* rvh2 = static_cast<TestRenderViewHost*>(

contents2->GetRenderViewHost());

EXPECT_FALSE(contents2->cross_navigation_pending());

- contents2->TestDidNavigate(rvh2, 2, url2, content::PAGE_TRANSITION_TYPED);

+ contents2->TestDidNavigate(rvh2, 2, url2, PAGE_TRANSITION_TYPED);

SiteInstance* instance2 = contents2->GetSiteInstance();

EXPECT_NE(instance1, instance2);

EXPECT_FALSE(contents2->cross_navigation_pending());

@@ -639,7 +618,7 @@

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

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

contents()->TestDidNavigate(

- orig_rvh, 2, url2, content::PAGE_TRANSITION_TYPED);

+ orig_rvh, 2, url2, PAGE_TRANSITION_TYPED);

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

EXPECT_EQ(instance1, instance3);

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

@@ -648,10 +627,10 @@

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

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

controller().LoadURL(

- url3, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ url3, Referrer(), PAGE_TRANSITION_TYPED, std::string());

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

contents()->TestDidNavigate(

- orig_rvh, 3, url3, content::PAGE_TRANSITION_TYPED);

+ orig_rvh, 3, url3, PAGE_TRANSITION_TYPED);

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

EXPECT_EQ(instance1, instance4);

}

@@ -666,15 +645,15 @@

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

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

controller().LoadURL(

- url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

- contents()->TestDidNavigate(orig_rvh, 1, url, content::PAGE_TRANSITION_TYPED);

+ url, Referrer(), PAGE_TRANSITION_TYPED, std::string());

+ contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED);

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

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

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

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

controller().LoadURL(

- url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());

EXPECT_TRUE(orig_rvh->is_waiting_for_beforeunload_ack());

orig_rvh->OnMessageReceived(ViewHostMsg_ShouldClose_ACK(

0, false, base::TimeTicks(), base::TimeTicks()));

@@ -684,7 +663,7 @@

// Navigate again, but simulate an onbeforeunload approval.

controller().LoadURL(

- url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());

EXPECT_TRUE(orig_rvh->is_waiting_for_beforeunload_ack());

orig_rvh->OnMessageReceived(ViewHostMsg_ShouldClose_ACK(

0, true, base::TimeTicks(), base::TimeTicks()));

@@ -699,7 +678,7 @@

// DidNavigate from the pending page

contents()->TestDidNavigate(

- pending_rvh, 1, url2, content::PAGE_TRANSITION_TYPED);

+ pending_rvh, 1, url2, PAGE_TRANSITION_TYPED);

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

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

EXPECT_EQ(pending_rvh, rvh());

@@ -718,15 +697,15 @@

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

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

controller().LoadURL(

- url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

- contents()->TestDidNavigate(orig_rvh, 1, url, content::PAGE_TRANSITION_TYPED);

+ url, Referrer(), PAGE_TRANSITION_TYPED, std::string());

+ contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED);

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

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

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

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

controller().LoadURL(

- url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());

EXPECT_TRUE(orig_rvh->is_waiting_for_beforeunload_ack());

orig_rvh->OnMessageReceived(ViewHostMsg_ShouldClose_ACK(

0, true, base::TimeTicks(), base::TimeTicks()));

@@ -750,9 +729,9 @@

// Start with a web ui page, which gets a new RVH with WebUI bindings.

const GURL url1("webcontentsimpltest://blah");

controller().LoadURL(

- url1, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ url1, Referrer(), PAGE_TRANSITION_TYPED, std::string());

TestRenderViewHost* ntp_rvh = test_rvh();

- contents()->TestDidNavigate(ntp_rvh, 1, url1, content::PAGE_TRANSITION_TYPED);

+ contents()->TestDidNavigate(ntp_rvh, 1, url1, PAGE_TRANSITION_TYPED);

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

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

@@ -761,12 +740,12 @@

EXPECT_EQ(url1, entry1->GetURL());

EXPECT_EQ(instance1,

NavigationEntryImpl::FromNavigationEntry(entry1)->site_instance());

- EXPECT_TRUE(ntp_rvh->GetEnabledBindings() & content::BINDINGS_POLICY_WEB_UI);

+ EXPECT_TRUE(ntp_rvh->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI);

// Navigate to new site.

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

controller().LoadURL(

- url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());

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

TestRenderViewHost* google_rvh =

static_cast<TestRenderViewHost*>(contents()->GetPendingRenderViewHost());

@@ -778,7 +757,7 @@

// DidNavigate from the pending page.

contents()->TestDidNavigate(

- google_rvh, 1, url2, content::PAGE_TRANSITION_TYPED);

+ google_rvh, 1, url2, PAGE_TRANSITION_TYPED);

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

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

@@ -789,16 +768,15 @@

EXPECT_EQ(url2, entry2->GetURL());

EXPECT_EQ(instance2,

NavigationEntryImpl::FromNavigationEntry(entry2)->site_instance());

- EXPECT_FALSE(google_rvh->GetEnabledBindings() &

- content::BINDINGS_POLICY_WEB_UI);

+ EXPECT_FALSE(google_rvh->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI);

// Navigate to third page on same site.

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

controller().LoadURL(

- url3, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ url3, Referrer(), PAGE_TRANSITION_TYPED, std::string());

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

contents()->TestDidNavigate(

- google_rvh, 2, url3, content::PAGE_TRANSITION_TYPED);

+ google_rvh, 2, url3, PAGE_TRANSITION_TYPED);

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

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

@@ -827,8 +805,7 @@

0, true, base::TimeTicks(), base::TimeTicks()));

// DidNavigate from the first back. This aborts the second back's pending RVH.

- contents()->TestDidNavigate(

- google_rvh, 1, url2, content::PAGE_TRANSITION_TYPED);

+ contents()->TestDidNavigate(google_rvh, 1, url2, PAGE_TRANSITION_TYPED);

// We should commit this page and forget about the second back.

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

@@ -855,20 +832,20 @@

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

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

controller().LoadURL(

- url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

- contents()->TestDidNavigate(orig_rvh, 1, url, content::PAGE_TRANSITION_TYPED);

+ url, Referrer(), PAGE_TRANSITION_TYPED, std::string());

+ contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED);

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

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

// Start navigating to new site.

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

controller().LoadURL(

- url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ url2, Referrer(), 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"),

- content::PAGE_TRANSITION_AUTO_SUBFRAME);

+ PAGE_TRANSITION_AUTO_SUBFRAME);

EXPECT_TRUE(orig_rvh->is_waiting_for_beforeunload_ack());

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

@@ -889,14 +866,14 @@

// Navigate to NTP URL.

const GURL url("webcontentsimpltest://blah");

controller().LoadURL(

- url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ url, Referrer(), PAGE_TRANSITION_TYPED, std::string());

TestRenderViewHost* orig_rvh = test_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, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());

TestRenderViewHost* pending_rvh =

static_cast<TestRenderViewHost*>(contents()->GetPendingRenderViewHost());

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

@@ -911,8 +888,7 @@

EXPECT_FALSE(orig_rvh->is_waiting_for_beforeunload_ack());

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

- contents()->TestDidNavigate(

- pending_rvh, 1, url2, content::PAGE_TRANSITION_TYPED);

+ contents()->TestDidNavigate(pending_rvh, 1, url2, PAGE_TRANSITION_TYPED);

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

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

}

@@ -929,15 +905,15 @@

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

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

controller().LoadURL(

- url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

- contents()->TestDidNavigate(orig_rvh, 1, url, content::PAGE_TRANSITION_TYPED);

+ url, Referrer(), PAGE_TRANSITION_TYPED, std::string());

+ contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED);

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

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

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

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

controller().LoadURL(

- url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());

orig_rvh->OnMessageReceived(ViewHostMsg_ShouldClose_ACK(

0, true, base::TimeTicks(), base::TimeTicks()));

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

@@ -954,7 +930,7 @@

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

ViewHostMsg_FrameNavigate_Params params1a;

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

- content::PAGE_TRANSITION_TYPED);

+ PAGE_TRANSITION_TYPED);

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

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

@@ -963,7 +939,7 @@

// DidNavigate from the pending page should commit it.

contents()->TestDidNavigate(

- pending_rvh, 1, url2, content::PAGE_TRANSITION_TYPED);

+ pending_rvh, 1, url2, PAGE_TRANSITION_TYPED);

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

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

EXPECT_EQ(pending_rvh, rvh());

@@ -981,15 +957,14 @@

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

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

controller().LoadURL(

- url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

- contents()->TestDidNavigate(orig_rvh, 1, url, content::PAGE_TRANSITION_TYPED);

+ url, Referrer(), PAGE_TRANSITION_TYPED, std::string());

+ contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED);

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

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

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

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

- controller().LoadURL(

- url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ controller().LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());

EXPECT_TRUE(orig_rvh->is_waiting_for_beforeunload_ack());

orig_rvh->OnMessageReceived(ViewHostMsg_ShouldClose_ACK(

0, true, base::TimeTicks(), base::TimeTicks()));

@@ -1000,8 +975,7 @@

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

// navigates in the current RVH's SiteInstance.

- controller().LoadURL(

- url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ controller().LoadURL(url, Referrer(), PAGE_TRANSITION_TYPED, std::string());

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

// longer swapped out.

@@ -1021,32 +995,29 @@

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

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

- controller().LoadURL(

- url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ controller().LoadURL(url, Referrer(), PAGE_TRANSITION_TYPED, std::string());

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

EXPECT_TRUE(entry == NULL);

// Committed entry should have content state after DidNavigate.

- contents()->TestDidNavigate(orig_rvh, 1, url, content::PAGE_TRANSITION_TYPED);

+ contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED);

entry = controller().GetLastCommittedEntry();

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

// Navigate to same site.

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

- controller().LoadURL(

- url2, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ controller().LoadURL(url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());

entry = controller().GetLastCommittedEntry();

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

// Committed entry should have content state after DidNavigate.

- contents()->TestDidNavigate(

- orig_rvh, 2, url2, content::PAGE_TRANSITION_TYPED);

+ contents()->TestDidNavigate(orig_rvh, 2, url2, PAGE_TRANSITION_TYPED);

entry = controller().GetLastCommittedEntry();

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

// Now go back. Committed entry should still have content state.

controller().GoBack();

- contents()->TestDidNavigate(orig_rvh, 1, url, content::PAGE_TRANSITION_TYPED);

+ contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED);

entry = controller().GetLastCommittedEntry();

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

}

@@ -1060,8 +1031,8 @@

// When opening a new window, it is navigated to about:blank internally.

// Currently, this results in two DidNavigate events.

const GURL url(chrome::kAboutBlankURL);

- contents()->TestDidNavigate(orig_rvh, 1, url, content::PAGE_TRANSITION_TYPED);

+ contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED);

// Should have a content state here.

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

@@ -1075,12 +1046,11 @@

// Navigating to a normal page should not cause a process swap.

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

- controller().LoadURL(new_url, content::Referrer(),

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

+ controller().LoadURL(new_url, Referrer(),

+ PAGE_TRANSITION_TYPED, std::string());

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

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

- contents()->TestDidNavigate(orig_rvh, 1, new_url,

- content::PAGE_TRANSITION_TYPED);

+ contents()->TestDidNavigate(orig_rvh, 1, new_url, PAGE_TRANSITION_TYPED);

NavigationEntryImpl* entry_impl2 = NavigationEntryImpl::FromNavigationEntry(

controller().GetLastCommittedEntry());

EXPECT_EQ(site_instance_id, entry_impl2->site_instance()->GetId());

@@ -1102,8 +1072,8 @@

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

// Initiate a browser navigation that will trigger the interstitial

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

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

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

+ PAGE_TRANSITION_TYPED, std::string());

// Show an interstitial.

TestInterstitialPage::InterstitialState state =

@@ -1239,8 +1209,8 @@

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

// Initiate a browser navigation that will trigger the interstitial

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

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

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

+ PAGE_TRANSITION_TYPED, std::string());

// Show an interstitial.

TestInterstitialPage::InterstitialState state =

@@ -1683,8 +1653,7 @@

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

// interstitial finishes loading.

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

- controller().LoadURL(

- url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());

+ controller().LoadURL(url, Referrer(), PAGE_TRANSITION_TYPED, std::string());

ASSERT_FALSE(deleted);

EXPECT_FALSE(interstitial->is_showing());

@@ -1775,8 +1744,7 @@

// Start a navigation to a page

contents()->GetController().LoadURL(

- kGURL, content::Referrer(), content::PAGE_TRANSITION_TYPED,

- std::string());

+ kGURL, Referrer(), PAGE_TRANSITION_TYPED, std::string());

// Simulate that navigation triggering an interstitial.

TestInterstitialPage::InterstitialState state =

@@ -1791,8 +1759,7 @@

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

// interstitial.

contents()->GetController().LoadURL(

- kGURL, content::Referrer(), content::PAGE_TRANSITION_TYPED,

- std::string());

+ kGURL, Referrer(), PAGE_TRANSITION_TYPED, std::string());

TestInterstitialPage::InterstitialState state2 =

TestInterstitialPage::UNDECIDED;

bool deleted2 = false;

@@ -1822,10 +1789,9 @@

// Start a navigation to a page

contents()->GetController().LoadURL(

- kGURL, content::Referrer(), content::PAGE_TRANSITION_TYPED,

- std::string());

+ kGURL, Referrer(), PAGE_TRANSITION_TYPED, std::string());

// DidNavigate from the page

- contents()->TestDidNavigate(rvh(), 1, kGURL, content::PAGE_TRANSITION_TYPED);

+ contents()->TestDidNavigate(rvh(), 1, kGURL, PAGE_TRANSITION_TYPED);

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

TestInterstitialPage::InterstitialState state =

@@ -1843,7 +1809,7 @@

bool did_suppress_message = false;

contents()->RunJavaScriptMessage(contents()->GetRenderViewHost(),

ASCIIToUTF16("This is an informative message"), ASCIIToUTF16("OK"),

- kGURL, content::JAVASCRIPT_MESSAGE_TYPE_ALERT, dummy_message,

+ kGURL, JAVASCRIPT_MESSAGE_TYPE_ALERT, dummy_message,

&did_suppress_message);

EXPECT_TRUE(did_suppress_message);

}

@@ -1857,8 +1823,8 @@

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

// Initiate a browser navigation that will trigger the interstitial

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

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

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

+ PAGE_TRANSITION_TYPED, std::string());

// Show an interstitial.

TestInterstitialPage::InterstitialState state =

@@ -1946,3 +1912,5 @@

EXPECT_TRUE(static_cast<InterstitialPageImpl*>(

other_contents->GetInterstitialPage())->reload_on_dont_proceed());

}

+} // namespace content

« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | content/browser/web_contents/web_contents_view_android.cc » ('j') | no next file with comments »