content/browser/tab_contents/tab_contents_unittest.cc - Issue 9146028: Define the public interface for content browser SiteInstance. This interface is implemented by th...

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

Issue 9146028: Define the public interface for content browser SiteInstance. This interface is implemented by th... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 8 years, 11 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

« content/browser/tab_contents/render_view_host_manager.h ('K') | « content/browser/tab_contents/tab_contents.cc ('k') | content/browser/tab_contents/test_tab_contents.h » ('j') | content/browser/tab_contents/test_tab_contents.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/tab_contents/tab_contents_unittest.cc

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

--- content/browser/tab_contents/tab_contents_unittest.cc (revision 118703)

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

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

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

#include "content/browser/renderer_host/render_widget_host_view.h"

#include "content/browser/renderer_host/test_render_view_host.h"

-#include "content/browser/site_instance.h"

+#include "content/browser/site_instance_impl.h"

#include "content/browser/tab_contents/interstitial_page.h"

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

#include "content/browser/tab_contents/test_tab_contents.h"

@@ -168,7 +168,7 @@

protected:

virtual RenderViewHost* CreateRenderViewHost() {

return new TestRenderViewHost(

- SiteInstance::CreateSiteInstance(tab()->GetBrowserContext()),

+ content::SiteInstance::CreateSiteInstance(tab()->GetBrowserContext()),

this, MSG_ROUTING_NONE);

}

@@ -277,8 +277,9 @@

// Test to ensure UpdateMaxPageID is working properly.

TEST_F(TabContentsTest, UpdateMaxPageID) {

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

- scoped_refptr<SiteInstance> instance2(SiteInstance::CreateSiteInstance(NULL));

+ content::SiteInstance* instance1 = contents()->GetSiteInstance();

+ scoped_refptr<content::SiteInstance> instance2(

+ content::SiteInstance::CreateSiteInstance(NULL));

// Starts at -1.

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

@@ -301,7 +302,7 @@

// Test simple same-SiteInstance navigation.

TEST_F(TabContentsTest, SimpleNavigation) {

TestRenderViewHost* orig_rvh = rvh();

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

+ content::SiteInstance* instance1 = contents()->GetSiteInstance();

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

// Navigate to URL

@@ -348,7 +349,7 @@

TestRenderViewHost* orig_rvh = rvh();

int orig_rvh_delete_count = 0;

orig_rvh->set_delete_counter(&orig_rvh_delete_count);

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

+ content::SiteInstance* instance1 = contents()->GetSiteInstance();

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

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

@@ -376,7 +377,7 @@

// DidNavigate from the pending page

contents()->TestDidNavigate(

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

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

+ content::SiteInstance* instance2 = contents()->GetSiteInstance();

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

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

@@ -423,7 +424,7 @@

TestRenderViewHost* orig_rvh = rvh();

int orig_rvh_delete_count = 0;

orig_rvh->set_delete_counter(&orig_rvh_delete_count);

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

+ content::SiteInstance* instance1 = contents()->GetSiteInstance();

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

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

@@ -449,7 +450,7 @@

// DidNavigate from the new page

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

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

+ content::SiteInstance* instance2 = contents()->GetSiteInstance();

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

EXPECT_EQ(new_rvh, rvh());

@@ -466,7 +467,7 @@

TEST_F(TabContentsTest, NavigateTwoTabsCrossSite) {

contents()->transition_cross_site = true;

TestRenderViewHost* orig_rvh = rvh();

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

+ content::SiteInstance* instance1 = contents()->GetSiteInstance();

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

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

@@ -494,7 +495,7 @@

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

contents()->TestDidNavigate(

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

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

+ content::SiteInstance* instance2a = contents()->GetSiteInstance();

EXPECT_NE(instance1, instance2a);

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

@@ -514,7 +515,7 @@

// now covered by the CrossSiteBoundariesAfterCrash test.

contents2.TestDidNavigate(

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

- SiteInstance* instance2b = contents2.GetSiteInstance();

+ content::SiteInstance* instance2b = contents2.GetSiteInstance();

EXPECT_NE(instance1, instance2b);

// Both tabs should now be in the same SiteInstance.

@@ -526,7 +527,7 @@

TEST_F(TabContentsTest, CrossSiteComparesAgainstCurrentPage) {

contents()->transition_cross_site = true;

TestRenderViewHost* orig_rvh = rvh();

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

+ content::SiteInstance* instance1 = contents()->GetSiteInstance();

// Navigate to URL.

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

@@ -548,7 +549,7 @@

contents2.GetRenderViewHost());

EXPECT_FALSE(contents2.cross_navigation_pending());

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

- SiteInstance* instance2 = contents2.GetSiteInstance();

+ content::SiteInstance* instance2 = contents2.GetSiteInstance();

EXPECT_NE(instance1, instance2);

EXPECT_FALSE(contents2.cross_navigation_pending());

@@ -556,7 +557,7 @@

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

contents()->TestDidNavigate(

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

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

+ content::SiteInstance* instance3 = contents()->GetSiteInstance();

EXPECT_EQ(instance1, instance3);

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

@@ -568,7 +569,7 @@

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

contents()->TestDidNavigate(

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

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

+ content::SiteInstance* instance4 = contents()->GetSiteInstance();

EXPECT_EQ(instance1, instance4);

}

@@ -577,7 +578,7 @@

TEST_F(TabContentsTest, CrossSiteUnloadHandlers) {

contents()->transition_cross_site = true;

TestRenderViewHost* orig_rvh = rvh();

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

+ content::SiteInstance* instance1 = contents()->GetSiteInstance();

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

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

@@ -614,7 +615,7 @@

// DidNavigate from the pending page

contents()->TestDidNavigate(

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

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

+ content::SiteInstance* instance2 = contents()->GetSiteInstance();

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

EXPECT_EQ(pending_rvh, rvh());

EXPECT_NE(instance1, instance2);

@@ -627,7 +628,7 @@

TEST_F(TabContentsTest, CrossSiteNavigationPreempted) {

contents()->transition_cross_site = true;

TestRenderViewHost* orig_rvh = rvh();

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

+ content::SiteInstance* instance1 = contents()->GetSiteInstance();

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

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

@@ -650,7 +651,7 @@

// Verify that the pending navigation is cancelled.

EXPECT_FALSE(orig_rvh->is_waiting_for_beforeunload_ack());

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

+ content::SiteInstance* instance2 = contents()->GetSiteInstance();

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

EXPECT_EQ(orig_rvh, rvh());

EXPECT_EQ(instance1, instance2);

@@ -667,7 +668,7 @@

TestRenderViewHost* ntp_rvh = rvh();

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

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

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

+ content::SiteInstance* instance1 = contents()->GetSiteInstance();

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

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

@@ -691,7 +692,7 @@

contents()->TestDidNavigate(

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

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

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

+ content::SiteInstance* instance2 = contents()->GetSiteInstance();

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

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

@@ -711,7 +712,7 @@

contents()->TestDidNavigate(

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

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

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

+ content::SiteInstance* instance3 = contents()->GetSiteInstance();

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

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

@@ -832,7 +833,7 @@

TEST_F(TabContentsTest, CrossSiteCantPreemptAfterUnload) {

contents()->transition_cross_site = true;

TestRenderViewHost* orig_rvh = rvh();

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

+ content::SiteInstance* instance1 = contents()->GetSiteInstance();

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

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

@@ -871,7 +872,7 @@

// DidNavigate from the pending page should commit it.

contents()->TestDidNavigate(

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

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

+ content::SiteInstance* instance2 = contents()->GetSiteInstance();

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

EXPECT_EQ(pending_rvh, rvh());

EXPECT_NE(instance1, instance2);

@@ -883,7 +884,7 @@

TEST_F(TabContentsTest, CrossSiteNavigationCanceled) {

contents()->transition_cross_site = true;

TestRenderViewHost* orig_rvh = rvh();

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

+ content::SiteInstance* instance1 = contents()->GetSiteInstance();

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

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

@@ -912,7 +913,7 @@

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

// longer swapped out.

EXPECT_FALSE(orig_rvh->is_waiting_for_beforeunload_ack());

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

+ content::SiteInstance* instance2 = contents()->GetSiteInstance();

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

EXPECT_EQ(orig_rvh, rvh());

EXPECT_FALSE(orig_rvh->is_swapped_out());