| Index: content/browser/web_contents/web_contents_impl_unittest.cc
|
| diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
|
| index b487a163b66d2208d91d80b834907c0c8a6e4bb0..4c86357330abb589e6afcaadd12c14168898cdf6 100644
|
| --- a/content/browser/web_contents/web_contents_impl_unittest.cc
|
| +++ b/content/browser/web_contents/web_contents_impl_unittest.cc
|
| @@ -449,7 +449,6 @@ TEST_F(WebContentsImplTest, NavigateToExcessivelyLongURL) {
|
| // Test that navigating across a site boundary creates a new RenderViewHost
|
| // with a new SiteInstance. Going back should do the same.
|
| TEST_F(WebContentsImplTest, CrossSiteBoundaries) {
|
| - contents()->transition_cross_site = true;
|
| TestRenderViewHost* orig_rvh = test_rvh();
|
| RenderFrameHostImpl* orig_rfh =
|
| contents()->GetFrameTree()->root()->current_frame_host();
|
| @@ -550,7 +549,6 @@ TEST_F(WebContentsImplTest, CrossSiteBoundaries) {
|
| // Test that navigating across a site boundary after a crash creates a new
|
| // RVH without requiring a cross-site transition (i.e., PENDING state).
|
| TEST_F(WebContentsImplTest, CrossSiteBoundariesAfterCrash) {
|
| - contents()->transition_cross_site = true;
|
| TestRenderViewHost* orig_rvh = test_rvh();
|
| int orig_rvh_delete_count = 0;
|
| orig_rvh->set_delete_counter(&orig_rvh_delete_count);
|
| @@ -596,7 +594,6 @@ TEST_F(WebContentsImplTest, CrossSiteBoundariesAfterCrash) {
|
| // both contentses to a new site will place both contentses in a single
|
| // SiteInstance.
|
| TEST_F(WebContentsImplTest, NavigateTwoTabsCrossSite) {
|
| - contents()->transition_cross_site = true;
|
| TestRenderViewHost* orig_rvh = test_rvh();
|
| SiteInstance* instance1 = contents()->GetSiteInstance();
|
|
|
| @@ -609,7 +606,6 @@ TEST_F(WebContentsImplTest, NavigateTwoTabsCrossSite) {
|
| // Open a new contents with the same SiteInstance, navigated to the same site.
|
| scoped_ptr<TestWebContents> contents2(
|
| TestWebContents::Create(browser_context(), instance1));
|
| - contents2->transition_cross_site = true;
|
| contents2->GetController().LoadURL(url, Referrer(),
|
| PAGE_TRANSITION_TYPED,
|
| std::string());
|
| @@ -659,7 +655,6 @@ TEST_F(WebContentsImplTest, NavigateDoesNotUseUpSiteInstance) {
|
| WebContentsImplTestBrowserClient browser_client;
|
| SetBrowserClientForTesting(&browser_client);
|
|
|
| - contents()->transition_cross_site = true;
|
| TestRenderViewHost* orig_rvh = test_rvh();
|
| RenderFrameHostImpl* orig_rfh =
|
| contents()->GetFrameTree()->root()->current_frame_host();
|
| @@ -748,7 +743,6 @@ TEST_F(WebContentsImplTest, NavigateDoesNotUseUpSiteInstance) {
|
| // Test that we can find an opener RVH even if it's pending.
|
| // http://crbug.com/176252.
|
| TEST_F(WebContentsImplTest, FindOpenerRVHWhenPending) {
|
| - contents()->transition_cross_site = true;
|
| TestRenderViewHost* orig_rvh = test_rvh();
|
|
|
| // Navigate to a URL.
|
| @@ -778,7 +772,6 @@ TEST_F(WebContentsImplTest, FindOpenerRVHWhenPending) {
|
| // Tests that WebContentsImpl uses the current URL, not the SiteInstance's site,
|
| // to determine whether a navigation is cross-site.
|
| TEST_F(WebContentsImplTest, CrossSiteComparesAgainstCurrentPage) {
|
| - contents()->transition_cross_site = true;
|
| RenderViewHost* orig_rvh = rvh();
|
| SiteInstance* instance1 = contents()->GetSiteInstance();
|
|
|
| @@ -792,7 +785,6 @@ TEST_F(WebContentsImplTest, CrossSiteComparesAgainstCurrentPage) {
|
| // Open a related contents to a second site.
|
| scoped_ptr<TestWebContents> contents2(
|
| TestWebContents::Create(browser_context(), instance1));
|
| - contents2->transition_cross_site = true;
|
| const GURL url2("http://www.yahoo.com");
|
| contents2->GetController().LoadURL(url2, Referrer(),
|
| PAGE_TRANSITION_TYPED,
|
| @@ -830,7 +822,6 @@ TEST_F(WebContentsImplTest, CrossSiteComparesAgainstCurrentPage) {
|
| // Test that the onbeforeunload and onunload handlers run when navigating
|
| // across site boundaries.
|
| TEST_F(WebContentsImplTest, CrossSiteUnloadHandlers) {
|
| - contents()->transition_cross_site = true;
|
| TestRenderViewHost* orig_rvh = test_rvh();
|
| SiteInstance* instance1 = contents()->GetSiteInstance();
|
|
|
| @@ -882,7 +873,6 @@ TEST_F(WebContentsImplTest, CrossSiteUnloadHandlers) {
|
| // navigate to a different URL and have it displayed, canceling the slow
|
| // navigation.
|
| TEST_F(WebContentsImplTest, CrossSiteNavigationPreempted) {
|
| - contents()->transition_cross_site = true;
|
| TestRenderViewHost* orig_rvh = test_rvh();
|
| SiteInstance* instance1 = contents()->GetSiteInstance();
|
|
|
| @@ -917,8 +907,6 @@ TEST_F(WebContentsImplTest, CrossSiteNavigationPreempted) {
|
| }
|
|
|
| TEST_F(WebContentsImplTest, CrossSiteNavigationBackPreempted) {
|
| - contents()->transition_cross_site = true;
|
| -
|
| // Start with a web ui page, which gets a new RVH with WebUI bindings.
|
| const GURL url1("chrome://blah");
|
| controller().LoadURL(
|
| @@ -1021,7 +1009,6 @@ TEST_F(WebContentsImplTest, CrossSiteNavigationBackPreempted) {
|
| // Test that during a slow cross-site navigation, a sub-frame navigation in the
|
| // original renderer will not cancel the slow navigation (bug 42029).
|
| TEST_F(WebContentsImplTest, CrossSiteNavigationNotPreemptedByFrame) {
|
| - contents()->transition_cross_site = true;
|
| TestRenderViewHost* orig_rvh = test_rvh();
|
|
|
| // Navigate to URL. First URL should use first RenderViewHost.
|
| @@ -1057,8 +1044,6 @@ TEST_F(WebContentsImplTest, CrossSiteNavigationNotPreemptedByFrame) {
|
| // We should only preempt the cross-site navigation if the previous renderer
|
| // has started a new navigation. See http://crbug.com/79176.
|
| TEST_F(WebContentsImplTest, CrossSiteNotPreemptedDuringBeforeUnload) {
|
| - contents()->transition_cross_site = true;
|
| -
|
| // Navigate to NTP URL.
|
| const GURL url("chrome://blah");
|
| controller().LoadURL(
|
| @@ -1094,7 +1079,6 @@ TEST_F(WebContentsImplTest, CrossSiteNotPreemptedDuringBeforeUnload) {
|
| // is almost ready to be displayed, and the original renderer is only given a
|
| // short chance to run an unload handler. Prevents regression of bug 23942.
|
| TEST_F(WebContentsImplTest, CrossSiteCantPreemptAfterUnload) {
|
| - contents()->transition_cross_site = true;
|
| TestRenderViewHost* orig_rvh = test_rvh();
|
| SiteInstance* instance1 = contents()->GetSiteInstance();
|
|
|
| @@ -1152,7 +1136,6 @@ TEST_F(WebContentsImplTest, CrossSiteCantPreemptAfterUnload) {
|
| // Test that a cross-site navigation that doesn't commit after the unload
|
| // handler doesn't leave the contents in a stuck state. http://crbug.com/88562
|
| TEST_F(WebContentsImplTest, CrossSiteNavigationCanceled) {
|
| - contents()->transition_cross_site = true;
|
| TestRenderViewHost* orig_rvh = test_rvh();
|
| SiteInstance* instance1 = contents()->GetSiteInstance();
|
|
|
|
|