Plumb the referrer throughout the OpenURL APIs....

chrome/browser/web_contents_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/logging.h"
 #include "chrome/browser/interstitial_page.h"
 #include "chrome/browser/navigation_controller.h"
 #include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/render_widget_host_view.h"
@@ skipping 304 matching lines @@
 TEST_F(WebContentsTest, SimpleNavigation) {
   TestRenderViewHost* orig_rvh = contents->rvh();
   SiteInstance* instance1 = contents->GetSiteInstance();
   EXPECT_TRUE(contents->pending_rvh() == NULL);
   EXPECT_TRUE(contents->original_rvh() == NULL);
   EXPECT_TRUE(contents->interstitial_rvh() == NULL);
   EXPECT_FALSE(orig_rvh->is_loading);
 
   // Navigate to URL
   const GURL url("http://www.google.com");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
+  contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_TRUE(orig_rvh->is_loading);
   EXPECT_EQ(instance1, orig_rvh->site_instance());
   // Controller's pending entry will have a NULL site instance until we assign
   // it in DidNavigate.
   EXPECT_TRUE(
     contents->controller()->GetActiveEntry()->site_instance() == NULL);
 
   // DidNavigate from the page
   ViewHostMsg_FrameNavigate_Params params;
@@ skipping 12 matching lines @@
 // without proceeding.
 TEST_F(WebContentsTest, ShowInterstitialDontProceed) {
   TestRenderViewHost* orig_rvh = contents->rvh();
   EXPECT_TRUE(contents->pending_rvh() == NULL);
   EXPECT_TRUE(contents->original_rvh() == NULL);
   EXPECT_TRUE(contents->interstitial_rvh() == NULL);
   EXPECT_FALSE(orig_rvh->is_loading);
 
   // Navigate to URL
   const GURL url("http://www.google.com");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
+  contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_TRUE(orig_rvh->is_loading);
 
   // Show interstitial
   const GURL interstitial_url("http://interstitial");
   InterstitialPage* interstitial = new InterstitialPage(contents,
                                                         true,
                                                         interstitial_url);
   interstitial->Show();
   EXPECT_TRUE(contents->state_is_entering_interstitial());
@@ skipping 20 matching lines @@
 
 // Test navigating to a page that shows an interstitial, then proceeding.
 TEST_F(WebContentsTest, ShowInterstitialProceed) {
   TestRenderViewHost* orig_rvh = contents->rvh();
 
   // The RenderViewHost's SiteInstance should not yet have a site.
   EXPECT_EQ(GURL(), contents->rvh()->site_instance()->site());
 
   // Navigate to URL
   const GURL url("http://www.google.com");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
+  contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
 
   // Show interstitial
   const GURL interstitial_url("http://interstitial");
   InterstitialPage* interstitial = new InterstitialPage(contents,
                                                         true,
                                                         interstitial_url);
   interstitial->Show();
   TestRenderViewHost* interstitial_rvh = contents->interstitial_rvh();
 
   // DidNavigate from the interstitial
@@ skipping 25 matching lines @@
   // Since we weren't viewing a page before, we shouldn't be able to go back.
   EXPECT_FALSE(contents->controller()->CanGoBack());
 }
 
 // Test navigating to a page that shows an interstitial, then navigating away.
 TEST_F(WebContentsTest, ShowInterstitialThenNavigate) {
   TestRenderViewHost* orig_rvh = contents->rvh();
 
   // Navigate to URL
   const GURL url("http://www.google.com");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
+  contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
 
   // Show interstitial
   const GURL interstitial_url("http://interstitial");
   InterstitialPage* interstitial = new InterstitialPage(contents,
                                                         true,
                                                         interstitial_url);
   interstitial->Show();
   TestRenderViewHost* interstitial_rvh = contents->interstitial_rvh();
 
   // DidNavigate from the interstitial
   ViewHostMsg_FrameNavigate_Params params;
   InitNavigateParams(&params, 1, url);
   contents->TestDidNavigate(interstitial_rvh, params);
 
   // While interstitial showing, navigate to a new URL.
   const GURL url2("http://www.yahoo.com");
-  contents->controller()->LoadURL(url2, PageTransition::TYPED);
+  contents->controller()->LoadURL(url2, GURL(), PageTransition::TYPED);
   EXPECT_TRUE(contents->state_is_leaving_interstitial());
   EXPECT_EQ(interstitial_rvh, contents->render_view_host());
   EXPECT_TRUE(orig_rvh->is_loading);
   EXPECT_FALSE(interstitial_rvh->is_loading);
 
   // DidNavigate from the new URL.  In the old process model, we'll still have
   // the same RenderViewHost.
   ViewHostMsg_FrameNavigate_Params params2;
   InitNavigateParams(&params2, 2, url2);
   contents->TestDidNavigate(orig_rvh, params2);
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_EQ(orig_rvh, contents->render_view_host());
   EXPECT_FALSE(orig_rvh->is_loading);
 }
 
 // Ensures that an interstitial cannot be cancelled if a notification for a
 // navigation from an IFrame from the previous page is received while the
 // interstitial is being shown (bug #1182394).
 TEST_F(WebContentsTest, ShowInterstitialIFrameNavigate) {
   TestRenderViewHost* orig_rvh = contents->rvh();
   EXPECT_TRUE(contents->pending_rvh() == NULL);
   EXPECT_TRUE(contents->original_rvh() == NULL);
   EXPECT_TRUE(contents->interstitial_rvh() == NULL);
   EXPECT_FALSE(orig_rvh->is_loading);
 
   // Navigate to URL.
   const GURL url("http://www.google.com");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
+  contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_TRUE(orig_rvh->is_loading);
   ViewHostMsg_FrameNavigate_Params params1;
   InitNavigateParams(&params1, 1, url);
   contents->TestDidNavigate(orig_rvh, params1);
 
   // Show interstitial (in real world would probably be triggered by a resource
   // in the page).
   const GURL interstitial_url("http://interstitial");
   InterstitialPage* interstitial = new InterstitialPage(contents,
@@ skipping 21 matching lines @@
 }
 
 // Test navigating to an interstitial page from a normal page.  Also test
 // visiting the interstitial-inducing URL twice (bug 1079784), and test
 // that going back shows the first page and not the interstitial.
 TEST_F(WebContentsTest, VisitInterstitialURLTwice) {
   TestRenderViewHost* orig_rvh = contents->rvh();
 
   // Navigate to URL
   const GURL url("http://www.google.com");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
+  contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
   ViewHostMsg_FrameNavigate_Params params1;
   InitNavigateParams(&params1, 1, url);
   contents->TestDidNavigate(orig_rvh, params1);
 
   // Now navigate to an interstitial-inducing URL
   const GURL url2("https://www.google.com");
-  contents->controller()->LoadURL(url2, PageTransition::TYPED);
+  contents->controller()->LoadURL(url2, GURL(), PageTransition::TYPED);
   const GURL interstitial_url("http://interstitial");
   InterstitialPage* interstitial = new InterstitialPage(contents,
                                                         true,
                                                         interstitial_url);
   interstitial->Show();
   EXPECT_TRUE(contents->state_is_entering_interstitial());
   int interstitial_delete_counter = 0;
   TestRenderViewHost* interstitial_rvh = contents->interstitial_rvh();
   interstitial_rvh->set_delete_counter(&interstitial_delete_counter);
 
   // DidNavigate from the interstitial
   ViewHostMsg_FrameNavigate_Params params2;
   InitNavigateParams(&params2, 2, url2);
   contents->TestDidNavigate(interstitial_rvh, params2);
   EXPECT_TRUE(contents->state_is_interstitial());
   EXPECT_EQ(interstitial_rvh, contents->render_view_host());
 
   // While interstitial showing, navigate to the same URL.
-  contents->controller()->LoadURL(url2, PageTransition::TYPED);
+  contents->controller()->LoadURL(url2, GURL(), PageTransition::TYPED);
   EXPECT_TRUE(contents->state_is_leaving_interstitial());
   EXPECT_EQ(interstitial_rvh, contents->render_view_host());
 
   // Interstitial shown a second time in a different RenderViewHost.
   interstitial = new InterstitialPage(contents, true, interstitial_url);
   interstitial->Show();
   EXPECT_TRUE(contents->state_is_entering_interstitial());
   // We expect the original interstitial has been deleted.
   EXPECT_EQ(interstitial_delete_counter, 1);
   TestRenderViewHost* interstitial_rvh2 = contents->interstitial_rvh();
@@ skipping 33 matching lines @@
 // with a new SiteInstance.  Going back should do the same.
 TEST_F(WebContentsTest, CrossSiteBoundaries) {
   contents->transition_cross_site = true;
   TestRenderViewHost* orig_rvh = contents->rvh();
   int orig_rvh_delete_count = 0;
   orig_rvh->set_delete_counter(&orig_rvh_delete_count);
   SiteInstance* instance1 = contents->GetSiteInstance();
 
   // Navigate to URL.  First URL should use first RenderViewHost.
   const GURL url("http://www.google.com");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
+  contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
   ViewHostMsg_FrameNavigate_Params params1;
   InitNavigateParams(&params1, 1, url);
   contents->TestDidNavigate(orig_rvh, params1);
 
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_EQ(orig_rvh, contents->render_view_host());
   EXPECT_TRUE(contents->original_rvh() == NULL);
   EXPECT_TRUE(contents->interstitial_rvh() == NULL);
 
   // Navigate to new site
   const GURL url2("http://www.yahoo.com");
-  contents->controller()->LoadURL(url2, PageTransition::TYPED);
+  contents->controller()->LoadURL(url2, GURL(), PageTransition::TYPED);
   EXPECT_TRUE(contents->state_is_pending());
   TestRenderViewHost* pending_rvh = contents->pending_rvh();
   int pending_rvh_delete_count = 0;
   pending_rvh->set_delete_counter(&pending_rvh_delete_count);
 
   // DidNavigate from the pending page
   ViewHostMsg_FrameNavigate_Params params2;
   InitNavigateParams(&params2, 1, url2);
   contents->TestDidNavigate(pending_rvh, params2);
   SiteInstance* instance2 = contents->GetSiteInstance();
@@ skipping 24 matching lines @@
 // RVH without requiring a cross-site transition (i.e., PENDING state).
 TEST_F(WebContentsTest, CrossSiteBoundariesAfterCrash) {
   contents->transition_cross_site = true;
   TestRenderViewHost* orig_rvh = contents->rvh();
   int orig_rvh_delete_count = 0;
   orig_rvh->set_delete_counter(&orig_rvh_delete_count);
   SiteInstance* instance1 = contents->GetSiteInstance();
 
   // Navigate to URL.  First URL should use first RenderViewHost.
   const GURL url("http://www.google.com");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
+  contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
   ViewHostMsg_FrameNavigate_Params params1;
   InitNavigateParams(&params1, 1, url);
   contents->TestDidNavigate(orig_rvh, params1);
 
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_EQ(orig_rvh, contents->render_view_host());
   EXPECT_TRUE(contents->original_rvh() == NULL);
   EXPECT_TRUE(contents->interstitial_rvh() == NULL);
 
   // Crash the renderer.
   orig_rvh->is_created = false;
 
   // Navigate to new site.  We should not go into PENDING.
   const GURL url2("http://www.yahoo.com");
-  contents->controller()->LoadURL(url2, PageTransition::TYPED);
+  contents->controller()->LoadURL(url2, GURL(), PageTransition::TYPED);
   TestRenderViewHost* new_rvh = contents->rvh();
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_TRUE(contents->pending_rvh() == NULL);
   EXPECT_TRUE(contents->original_rvh() == NULL);
   EXPECT_TRUE(contents->interstitial_rvh() == NULL);
   EXPECT_NE(orig_rvh, new_rvh);
   EXPECT_EQ(orig_rvh_delete_count, 1);
 
   // DidNavigate from the new page
   ViewHostMsg_FrameNavigate_Params params2;
@@ skipping 11 matching lines @@
 
 // Test state transitions when showing an interstitial in the new process
 // model, and then choosing DontProceed.
 TEST_F(WebContentsTest, CrossSiteInterstitialDontProceed) {
   contents->transition_cross_site = true;
   TestRenderViewHost* orig_rvh = contents->rvh();
   SiteInstance* instance1 = contents->GetSiteInstance();
 
   // Navigate to URL.  First URL should use first RenderViewHost.
   const GURL url("http://www.google.com");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
+  contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
   ViewHostMsg_FrameNavigate_Params params1;
   InitNavigateParams(&params1, 1, url);
   contents->TestDidNavigate(orig_rvh, params1);
 
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_EQ(orig_rvh, contents->render_view_host());
 
   // Navigate to new site
   const GURL url2("https://www.google.com");
-  contents->controller()->LoadURL(url2, PageTransition::TYPED);
+  contents->controller()->LoadURL(url2, GURL(), PageTransition::TYPED);
   EXPECT_TRUE(contents->state_is_pending());
   TestRenderViewHost* pending_rvh = contents->pending_rvh();
 
   // Show an interstitial
   const GURL interstitial_url("http://interstitial");
   InterstitialPage* interstitial = new InterstitialPage(contents,
                                                         true,
                                                         interstitial_url);
   interstitial->Show();
   EXPECT_TRUE(contents->state_is_entering_interstitial());
@@ skipping 24 matching lines @@
 // model, and then choosing Proceed.
 TEST_F(WebContentsTest, CrossSiteInterstitialProceed) {
   contents->transition_cross_site = true;
   int orig_rvh_delete_count = 0;
   TestRenderViewHost* orig_rvh = contents->rvh();
   orig_rvh->set_delete_counter(&orig_rvh_delete_count);
   SiteInstance* instance1 = contents->GetSiteInstance();
 
   // Navigate to URL.  First URL should use first RenderViewHost.
   const GURL url("http://www.google.com");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
+  contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
   ViewHostMsg_FrameNavigate_Params params1;
   InitNavigateParams(&params1, 1, url);
   contents->TestDidNavigate(orig_rvh, params1);
 
   // Navigate to new site
   const GURL url2("https://www.google.com");
-  contents->controller()->LoadURL(url2, PageTransition::TYPED);
+  contents->controller()->LoadURL(url2, GURL(), PageTransition::TYPED);
   TestRenderViewHost* pending_rvh = contents->pending_rvh();
   int pending_rvh_delete_count = 0;
   pending_rvh->set_delete_counter(&pending_rvh_delete_count);
 
   // Show an interstitial
   const GURL interstitial_url("http://interstitial");
   InterstitialPage* interstitial = new InterstitialPage(contents,
                                                         true,
                                                         interstitial_url);
   interstitial->Show();
@@ skipping 49 matching lines @@
 
 // Tests that we can transition away from an interstitial page.
 TEST_F(WebContentsTest, CrossSiteInterstitialThenNavigate) {
   contents->transition_cross_site = true;
   int orig_rvh_delete_count = 0;
   TestRenderViewHost* orig_rvh = contents->rvh();
   orig_rvh->set_delete_counter(&orig_rvh_delete_count);
 
   // Navigate to URL.  First URL should use first RenderViewHost.
   const GURL url("http://www.google.com");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
+  contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
   ViewHostMsg_FrameNavigate_Params params1;
   InitNavigateParams(&params1, 1, url);
   contents->TestDidNavigate(orig_rvh, params1);
 
   // Show an interstitial
   const GURL interstitial_url("http://interstitial");
   InterstitialPage* interstitial = new InterstitialPage(contents,
                                                         false,
                                                         interstitial_url);
   interstitial->Show();
   TestRenderViewHost* interstitial_rvh = contents->interstitial_rvh();
 
   // DidNavigate from the interstitial
   ViewHostMsg_FrameNavigate_Params params2;
   InitNavigateParams(&params2, 1, url);
   contents->TestDidNavigate(interstitial_rvh, params2);
   EXPECT_TRUE(contents->state_is_interstitial());
   EXPECT_EQ(interstitial_rvh, contents->render_view_host());
   EXPECT_EQ(orig_rvh, contents->original_rvh());
   EXPECT_TRUE(contents->interstitial_rvh() == NULL);
 
   // Navigate to a new page.
   const GURL url2("http://www.yahoo.com");
-  contents->controller()->LoadURL(url2, PageTransition::TYPED);
+  contents->controller()->LoadURL(url2, GURL(), PageTransition::TYPED);
 
   TestRenderViewHost* new_rvh = contents->pending_rvh();
   ASSERT_TRUE(new_rvh != NULL);
   // Make sure the RVH is not suspended (bug #1236441).
   EXPECT_FALSE(new_rvh->IsNavigationSuspended());
   EXPECT_TRUE(contents->state_is_leaving_interstitial());
   EXPECT_EQ(interstitial_rvh, contents->render_view_host());
 
   // DidNavigate from the new page
   ViewHostMsg_FrameNavigate_Params params3;
   InitNavigateParams(&params3, 1, url2);
   contents->TestDidNavigate(new_rvh, params3);
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_EQ(new_rvh, contents->render_view_host());
   EXPECT_TRUE(contents->pending_rvh() == NULL);
   EXPECT_EQ(orig_rvh_delete_count, 1);
 }
 
 // Tests that we can transition away from an interstitial page even if the
 // interstitial renderer has crashed.
 TEST_F(WebContentsTest, CrossSiteInterstitialCrashThenNavigate) {
   contents->transition_cross_site = true;
   int orig_rvh_delete_count = 0;
   TestRenderViewHost* orig_rvh = contents->rvh();
   orig_rvh->set_delete_counter(&orig_rvh_delete_count);
 
   // Navigate to URL.  First URL should use first RenderViewHost.
   const GURL url("http://www.google.com");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
+  contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
   ViewHostMsg_FrameNavigate_Params params1;
   InitNavigateParams(&params1, 1, url);
   contents->TestDidNavigate(orig_rvh, params1);
 
   // Navigate to new site
   const GURL url2("https://www.google.com");
-  contents->controller()->LoadURL(url2, PageTransition::TYPED);
+  contents->controller()->LoadURL(url2, GURL(), PageTransition::TYPED);
   TestRenderViewHost* pending_rvh = contents->pending_rvh();
   int pending_rvh_delete_count = 0;
   pending_rvh->set_delete_counter(&pending_rvh_delete_count);
 
   // Show an interstitial
   const GURL interstitial_url("http://interstitial");
   InterstitialPage* interstitial = new InterstitialPage(contents,
                                                         true,
                                                         interstitial_url);
   interstitial->Show();
   TestRenderViewHost* interstitial_rvh = contents->interstitial_rvh();
 
   // DidNavigate from the interstitial
   ViewHostMsg_FrameNavigate_Params params2;
   InitNavigateParams(&params2, 1, url2);
   contents->TestDidNavigate(interstitial_rvh, params2);
   EXPECT_TRUE(contents->state_is_interstitial());
   EXPECT_EQ(interstitial_rvh, contents->render_view_host());
   EXPECT_EQ(orig_rvh, contents->original_rvh());
   EXPECT_EQ(pending_rvh, contents->pending_rvh());
   EXPECT_TRUE(contents->interstitial_rvh() == NULL);
 
   // Crash the interstitial RVH
   // (by making IsRenderViewLive() == false)
   interstitial_rvh->is_created = false;
 
   // Navigate to a new page.  Since interstitial RVH is dead, we should clean
   // it up and go to a new PENDING state, showing the orig_rvh.
   const GURL url3("http://www.yahoo.com");
-  contents->controller()->LoadURL(url3, PageTransition::TYPED);
+  contents->controller()->LoadURL(url3, GURL(), PageTransition::TYPED);
   TestRenderViewHost* new_rvh = contents->pending_rvh();
   ASSERT_TRUE(new_rvh != NULL);
   EXPECT_TRUE(contents->state_is_pending());
   EXPECT_EQ(orig_rvh, contents->render_view_host());
   EXPECT_EQ(pending_rvh_delete_count, 1);
   EXPECT_NE(interstitial_rvh, new_rvh);
   EXPECT_TRUE(contents->original_rvh() == NULL);
   EXPECT_TRUE(contents->interstitial_rvh() == NULL);
 
   // DidNavigate from the new page
   ViewHostMsg_FrameNavigate_Params params3;
   InitNavigateParams(&params3, 1, url3);
   contents->TestDidNavigate(new_rvh, params3);
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_EQ(new_rvh, contents->render_view_host());
   EXPECT_TRUE(contents->pending_rvh() == NULL);
   EXPECT_EQ(orig_rvh_delete_count, 1);
 }
 
 // Tests that we can transition away from an interstitial page even if both the
 // original and interstitial renderers have crashed.
 TEST_F(WebContentsTest, CrossSiteInterstitialCrashesThenNavigate) {
   contents->transition_cross_site = true;
   int orig_rvh_delete_count = 0;
   TestRenderViewHost* orig_rvh = contents->rvh();
   orig_rvh->set_delete_counter(&orig_rvh_delete_count);
 
   // Navigate to URL.  First URL should use first RenderViewHost.
   const GURL url("http://www.google.com");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
+  contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
   ViewHostMsg_FrameNavigate_Params params1;
   InitNavigateParams(&params1, 1, url);
   contents->TestDidNavigate(orig_rvh, params1);
 
   // Navigate to new site
   const GURL url2("https://www.google.com");
-  contents->controller()->LoadURL(url2, PageTransition::TYPED);
+  contents->controller()->LoadURL(url2, GURL(), PageTransition::TYPED);
   TestRenderViewHost* pending_rvh = contents->pending_rvh();
   int pending_rvh_delete_count = 0;
   pending_rvh->set_delete_counter(&pending_rvh_delete_count);
 
   // Show an interstitial
   const GURL interstitial_url("http://interstitial");
   InterstitialPage* interstitial = new InterstitialPage(contents,
                                                         true,
                                                         interstitial_url);
   interstitial->Show();
@@ skipping 10 matching lines @@
   EXPECT_TRUE(contents->interstitial_rvh() == NULL);
 
   // Crash both the original and interstitial RVHs
   // (by making IsRenderViewLive() == false)
   orig_rvh->is_created = false;
   interstitial_rvh->is_created = false;
 
   // Navigate to a new page.  Since both the interstitial and original RVHs are
   // dead, we should create a new RVH, jump back to NORMAL, and navigate.
   const GURL url3("http://www.yahoo.com");
-  contents->controller()->LoadURL(url3, PageTransition::TYPED);
+  contents->controller()->LoadURL(url3, GURL(), PageTransition::TYPED);
   TestRenderViewHost* new_rvh = contents->rvh();
   ASSERT_TRUE(new_rvh != NULL);
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_EQ(orig_rvh_delete_count, 1);
   EXPECT_EQ(pending_rvh_delete_count, 1);
   EXPECT_NE(interstitial_rvh, new_rvh);
   EXPECT_TRUE(contents->pending_rvh() == NULL);
   EXPECT_TRUE(contents->original_rvh() == NULL);
   EXPECT_TRUE(contents->interstitial_rvh() == NULL);
 
   // DidNavigate from the new page
   ViewHostMsg_FrameNavigate_Params params3;
   InitNavigateParams(&params3, 1, url3);
   contents->TestDidNavigate(new_rvh, params3);
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_EQ(new_rvh, contents->render_view_host());
 }
 
 // Test that opening a new tab in the same SiteInstance and then navigating
 // both tabs to a new site will place both tabs in a single SiteInstance.
 TEST_F(WebContentsTest, NavigateTwoTabsCrossSite) {
   contents->transition_cross_site = true;
   TestRenderViewHost* orig_rvh = contents->rvh();
   SiteInstance* instance1 = contents->GetSiteInstance();
 
   // Navigate to URL.  First URL should use first RenderViewHost.
   const GURL url("http://www.google.com");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
+  contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
   ViewHostMsg_FrameNavigate_Params params1;
   InitNavigateParams(&params1, 1, url);
   contents->TestDidNavigate(orig_rvh, params1);
 
   // Open a new tab with the same SiteInstance, navigated to the same site.
   TestWebContents* contents2 = new TestWebContents(profile.get(), instance1);
   params1.page_id = 2;  // Need this since the site instance is the same (which
                         // is the scope of page IDs) and we want to consider
                         // this a new page.
   contents2->transition_cross_site = true;
   contents2->SetupController(profile.get());
-  contents2->controller()->LoadURL(url, PageTransition::TYPED);
+  contents2->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
   contents2->TestDidNavigate(contents2->rvh(), params1);
 
   // Navigate first tab to a new site
   const GURL url2a("http://www.yahoo.com");
-  contents->controller()->LoadURL(url2a, PageTransition::TYPED);
+  contents->controller()->LoadURL(url2a, GURL(), PageTransition::TYPED);
   TestRenderViewHost* pending_rvh_a = contents->pending_rvh();
   ViewHostMsg_FrameNavigate_Params params2a;
   InitNavigateParams(&params2a, 1, url2a);
   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, PageTransition::TYPED);
+  contents2->controller()->LoadURL(url2b, GURL(), PageTransition::TYPED);
   TestRenderViewHost* pending_rvh_b = contents2->pending_rvh();
   EXPECT_TRUE(pending_rvh_b != NULL);
   EXPECT_TRUE(contents2->state_is_pending());
 
   // NOTE(creis): We used to be in danger of showing a sad tab page here if the
   // second tab hadn't navigated somewhere first (bug 1145430).  That case is
   // now covered by the CrossSiteBoundariesAfterCrash test.
 
   ViewHostMsg_FrameNavigate_Params params2b;
   InitNavigateParams(&params2b, 2, url2b);
   contents2->TestDidNavigate(pending_rvh_b, params2b);
   SiteInstance* instance2b = contents2->GetSiteInstance();
   EXPECT_NE(instance1, instance2b);
 
   // Both tabs should now be in the same SiteInstance.
   EXPECT_EQ(instance2a, instance2b);
 
   contents2->CloseContents();
 }
 
 // Tests that WebContents uses the current URL, not the SiteInstance's site, to
 // determine whether a navigation is cross-site.
 TEST_F(WebContentsTest, CrossSiteComparesAgainstCurrentPage) {
   contents->transition_cross_site = true;
   TestRenderViewHost* orig_rvh = contents->rvh();
   SiteInstance* instance1 = contents->GetSiteInstance();
 
   // Navigate to URL.
   const GURL url("http://www.google.com");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
+  contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
   ViewHostMsg_FrameNavigate_Params params1;
   InitNavigateParams(&params1, 1, url);
   contents->TestDidNavigate(orig_rvh, params1);
 
   // Open a related tab to a second site.
   TestWebContents* contents2 = new TestWebContents(profile.get(), instance1);
   contents2->transition_cross_site = true;
   contents2->SetupController(profile.get());
   const GURL url2("http://www.yahoo.com");
-  contents2->controller()->LoadURL(url2, PageTransition::TYPED);
+  contents2->controller()->LoadURL(url2, GURL(), PageTransition::TYPED);
   // The first RVH in contents2 isn't live yet, so we shortcut the PENDING
   // state and go straight to NORMAL.
   TestRenderViewHost* rvh2 = contents2->rvh();
   EXPECT_TRUE(contents2->state_is_normal());
   ViewHostMsg_FrameNavigate_Params params2;
   InitNavigateParams(&params2, 2, url2);
   contents2->TestDidNavigate(rvh2, params2);
   SiteInstance* instance2 = contents2->GetSiteInstance();
   EXPECT_NE(instance1, instance2);
   EXPECT_TRUE(contents2->state_is_normal());
 
   // 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);
   contents->TestDidNavigate(orig_rvh, params3);
   SiteInstance* instance3 = contents->GetSiteInstance();
   EXPECT_EQ(instance1, instance3);
   EXPECT_TRUE(contents->state_is_normal());
 
   // 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");
-  contents->controller()->LoadURL(url3, PageTransition::TYPED);
+  contents->controller()->LoadURL(url3, GURL(), PageTransition::TYPED);
   EXPECT_TRUE(contents->state_is_normal());
   ViewHostMsg_FrameNavigate_Params params4;
   InitNavigateParams(&params4, 3, url3);
   contents->TestDidNavigate(orig_rvh, params4);
   SiteInstance* instance4 = contents->GetSiteInstance();
   EXPECT_EQ(instance1, instance4);
 
   contents2->CloseContents();
 }
 
 // Test that the onbeforeunload and onunload handlers run when navigating
 // across site boundaries.
 TEST_F(WebContentsTest, CrossSiteUnloadHandlers) {
   contents->transition_cross_site = true;
   TestRenderViewHost* orig_rvh = contents->rvh();
   SiteInstance* instance1 = contents->GetSiteInstance();
 
   // Navigate to URL.  First URL should use first RenderViewHost.
   const GURL url("http://www.google.com");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
+  contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
   ViewHostMsg_FrameNavigate_Params params1;
   InitNavigateParams(&params1, 1, url);
   contents->TestDidNavigate(orig_rvh, params1);
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_EQ(orig_rvh, contents->render_view_host());
 
   // Navigate to new site, but simulate an onbeforeunload denial.
   const GURL url2("http://www.yahoo.com");
   orig_rvh->immediate_before_unload = false;
-  contents->controller()->LoadURL(url2, PageTransition::TYPED);
+  contents->controller()->LoadURL(url2, GURL(), PageTransition::TYPED);
   orig_rvh->TestOnMsgShouldClose(false);
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_EQ(orig_rvh, contents->render_view_host());
 
   // Navigate again, but simulate an onbeforeunload approval.
-  contents->controller()->LoadURL(url2, PageTransition::TYPED);
+  contents->controller()->LoadURL(url2, GURL(), PageTransition::TYPED);
   orig_rvh->TestOnMsgShouldClose(true);
   EXPECT_TRUE(contents->state_is_pending());
   TestRenderViewHost* pending_rvh = contents->pending_rvh();
 
   // We won't hear DidNavigate until the onunload handler has finished running.
   // (No way to simulate that here, but it involves a call from RDH to
   // WebContents::OnCrossSiteResponse.)
 
   // DidNavigate from the pending page
   ViewHostMsg_FrameNavigate_Params params2;
   InitNavigateParams(&params2, 1, url2);
   contents->TestDidNavigate(pending_rvh, params2);
   SiteInstance* instance2 = contents->GetSiteInstance();
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_EQ(pending_rvh, contents->render_view_host());
   EXPECT_NE(instance1, instance2);
   EXPECT_TRUE(contents->pending_rvh() == NULL);
   EXPECT_TRUE(contents->original_rvh() == NULL);
   EXPECT_TRUE(contents->interstitial_rvh() == NULL);
 }
 
 // Test that NavigationEntries have the correct content state after going
 // forward and back.  Prevents regression for bug 1116137.
 TEST_F(WebContentsTest, NavigationEntryContentState) {
   TestRenderViewHost* orig_rvh = contents->rvh();
 
   // Navigate to URL.  There should be no committed entry yet.
   const GURL url("http://www.google.com");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
+  contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
   NavigationEntry* entry = contents->controller()->GetLastCommittedEntry();
   EXPECT_TRUE(entry == NULL);
 
   // Committed entry should have content state after DidNavigate.
   ViewHostMsg_FrameNavigate_Params params1;
   InitNavigateParams(&params1, 1, url);
   contents->TestDidNavigate(orig_rvh, params1);
   entry = contents->controller()->GetLastCommittedEntry();
   EXPECT_FALSE(entry->content_state().empty());
 
   // Navigate to same site.
   const GURL url2("http://images.google.com");
-  contents->controller()->LoadURL(url2, PageTransition::TYPED);
+  contents->controller()->LoadURL(url2, GURL(), PageTransition::TYPED);
   entry = contents->controller()->GetLastCommittedEntry();
   EXPECT_FALSE(entry->content_state().empty());
 
   // Committed entry should have content state after DidNavigate.
   ViewHostMsg_FrameNavigate_Params params2;
   InitNavigateParams(&params2, 2, url2);
   contents->TestDidNavigate(orig_rvh, params2);
   entry = contents->controller()->GetLastCommittedEntry();
   EXPECT_FALSE(entry->content_state().empty());
 
@@ skipping 31 matching lines @@
   EXPECT_EQ(L"UTF-8", webkit_prefs.default_encoding);
   EXPECT_EQ(20, webkit_prefs.default_font_size);
   EXPECT_EQ(false, webkit_prefs.text_areas_are_resizable);
   EXPECT_EQ(true, webkit_prefs.uses_universal_detector);
 
   // These should still be the default values.
   EXPECT_EQ(L"Times New Roman", webkit_prefs.standard_font_family);
   EXPECT_EQ(true, webkit_prefs.javascript_enabled);
 }