DidNavigate refactor of doom

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/navigation_controller.h"
 #include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/render_widget_host_view.h"
 #include "chrome/browser/web_contents.h"
@@ skipping 211 matching lines @@
   // alternatives without using command-line switches.
   bool ShouldTransitionCrossSite() { return transition_cross_site; }
 
   // Promote DidNavigate to public.
   void TestDidNavigate(TestRenderViewHost* render_view_host,
                        const ViewHostMsg_FrameNavigate_Params& params) {
     DidNavigate(render_view_host, params);
     render_view_host->is_loading = false;
   }
 
-  // Promote IsInPageNavigation to public.
-  bool TestIsInPageNavigation(const GURL& url) {
-    return IsInPageNavigation(url);
-  }
-
   // Promote GetWebkitPrefs to public.
   WebPreferences TestGetWebkitPrefs() {
     return GetWebkitPrefs();
   }
 
   // Prevent interaction with views.
   bool CreateRenderViewForRenderManager(RenderViewHost* render_view_host) {
     // This will go to a TestRenderViewHost.
     render_view_host->CreateRenderView();
     return true;
@@ skipping 47 matching lines @@
     MessageLoop::current()->RunAllPending();
   }
 
   scoped_ptr<WebContentsTestingProfile> profile;
   TestWebContents* contents;
 
  private:
   MessageLoopForUI message_loop_;
 };
 
-// Test to make sure that title updates get stripped of whitespace
-TEST_F(WebContentsTest, OnMessageReceived) {
+// Test to make sure that title updates get stripped of whitespace.
+TEST_F(WebContentsTest, UpdateTitle) {
+  ViewHostMsg_FrameNavigate_Params params;
+  InitNavigateParams(&params, 0, GURL("about:blank"));
+
   NavigationController::LoadCommittedDetails details;
-  contents->controller()->DidNavigateToEntry(new NavigationEntry(
-      contents->type(), contents->site_instance(), 0, GURL("about:blank"),
-      std::wstring(), PageTransition::TYPED), &details);
+  contents->controller()->RendererDidNavigate(params, false, &details);
 
   contents->UpdateTitle(NULL, 0, L"    Lots O' Whitespace\n");
   EXPECT_EQ(std::wstring(L"Lots O' Whitespace"), contents->GetTitle());
 }
 
 // Test simple same-SiteInstance navigation.
 TEST_F(WebContentsTest, SimpleNavigation) {
   TestRenderViewHost* orig_rvh = contents->rvh();
-  SiteInstance* instance1 = contents->site_instance();
+  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);
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_TRUE(orig_rvh->is_loading);
@@ skipping 249 matching lines @@
   EXPECT_TRUE(contents->interstitial_rvh() == NULL);
 }
 
 // Test that navigating across a site boundary creates a new RenderViewHost
 // 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->site_instance();
+  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);
   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);
   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->site_instance();
+  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);
   EXPECT_EQ(orig_rvh_delete_count, 1);
 
   // Going back should switch SiteInstances again.  The first SiteInstance is
   // stored in the NavigationEntry, so it should be the same as at the start.
   contents->controller()->GoBack();
   TestRenderViewHost* goback_rvh = contents->pending_rvh();
   EXPECT_TRUE(contents->state_is_pending());
 
   // DidNavigate from the back action
   contents->TestDidNavigate(goback_rvh, params1);
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_EQ(goback_rvh, contents->render_view_host());
   EXPECT_EQ(pending_rvh_delete_count, 1);
-  EXPECT_EQ(instance1, contents->site_instance());
+  EXPECT_EQ(instance1, contents->GetSiteInstance());
 }
 
 // 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(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->site_instance();
+  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);
   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());
@@ skipping 11 matching lines @@
   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;
   InitNavigateParams(&params2, 1, url2);
   contents->TestDidNavigate(new_rvh, params2);
-  SiteInstance* instance2 = contents->site_instance();
+  SiteInstance* instance2 = contents->GetSiteInstance();
 
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_EQ(new_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 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->site_instance();
+  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);
   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());
@@ skipping 30 matching lines @@
   EXPECT_TRUE(contents->interstitial_rvh() == NULL);
 }
 
 // Test state transitions when showing an interstitial in the new process
 // 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->site_instance();
+  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);
   ViewHostMsg_FrameNavigate_Params params1;
   InitNavigateParams(&params1, 1, url);
   contents->TestDidNavigate(orig_rvh, params1);
 
   // Navigate to new site
   const GURL url2("https://www.google.com");
@@ skipping 21 matching lines @@
   EXPECT_TRUE(contents->state_is_leaving_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);
 
   // DidNavigate from the destination page should transition to new renderer
   ViewHostMsg_FrameNavigate_Params params3;
   InitNavigateParams(&params3, 2, url2);
   contents->TestDidNavigate(pending_rvh, params3);
-  SiteInstance* instance2 = contents->site_instance();
+  SiteInstance* instance2 = contents->GetSiteInstance();
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_EQ(pending_rvh, contents->render_view_host());
   EXPECT_TRUE(contents->original_rvh() == NULL);
   EXPECT_TRUE(contents->pending_rvh() == NULL);
   EXPECT_TRUE(contents->interstitial_rvh() == NULL);
   EXPECT_NE(instance1, instance2);
   EXPECT_EQ(orig_rvh_delete_count, 1);  // The original should be gone.
 
   // Since we were viewing a page before, we should be able to go back.
   EXPECT_TRUE(contents->controller()->CanGoBack());
 
   // Going back should switch SiteInstances again.  The first SiteInstance is
   // stored in the NavigationEntry, so it should be the same as at the start.
   contents->controller()->GoBack();
   TestRenderViewHost* goback_rvh = contents->pending_rvh();
   EXPECT_TRUE(contents->state_is_pending());
 
   // DidNavigate from the back action
   contents->TestDidNavigate(goback_rvh, params1);
   EXPECT_TRUE(contents->state_is_normal());
   EXPECT_EQ(goback_rvh, contents->render_view_host());
-  EXPECT_EQ(instance1, contents->site_instance());
+  EXPECT_EQ(instance1, contents->GetSiteInstance());
   EXPECT_EQ(pending_rvh_delete_count, 1);  // The second page's rvh should die.
 }
 
 // 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);
 
@@ skipping 162 matching lines @@
   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->site_instance();
+  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);
   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);
   contents2->transition_cross_site = true;
   contents2->SetupController(profile.get());
   contents2->controller()->LoadURL(url, 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);
   TestRenderViewHost* pending_rvh_a = contents->pending_rvh();
   ViewHostMsg_FrameNavigate_Params params2a;
   InitNavigateParams(&params2a, 1, url2a);
   contents->TestDidNavigate(pending_rvh_a, params2a);
-  SiteInstance* instance2a = contents->site_instance();
+  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);
   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->site_instance();
+  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->site_instance();
+  SiteInstance* instance1 = contents->GetSiteInstance();
 
   // Navigate to URL.
   const GURL url("http://www.google.com");
   contents->controller()->LoadURL(url, 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);
   // 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->site_instance();
+  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->site_instance();
+  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);
   EXPECT_TRUE(contents->state_is_normal());
   ViewHostMsg_FrameNavigate_Params params4;
   InitNavigateParams(&params4, 3, url3);
   contents->TestDidNavigate(orig_rvh, params4);
-  SiteInstance* instance4 = contents->site_instance();
+  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->site_instance();
+  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);
   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());
 
@@ skipping 12 matching lines @@
   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->site_instance();
+  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.
@@ skipping 44 matching lines @@
   ViewHostMsg_FrameNavigate_Params params1;
   InitNavigateParams(&params1, 1, url);
   contents->TestDidNavigate(orig_rvh, params1);
   contents->TestDidNavigate(orig_rvh, params1);
 
   // Should have a content state here.
   NavigationEntry* entry = contents->controller()->GetLastCommittedEntry();
   EXPECT_FALSE(entry->content_state().empty());
 }
 
-// Tests that IsInPageNavigation returns appropriate results.  Prevents
-// regression for bug 1126349.
-TEST_F(WebContentsTest, IsInPageNavigation) {
-  TestRenderViewHost* rvh = contents->rvh();
-
-  // Navigate to URL with no refs.
-  const GURL url("http://www.google.com/home.html");
-  contents->controller()->LoadURL(url, PageTransition::TYPED);
-  ViewHostMsg_FrameNavigate_Params params;
-  InitNavigateParams(&params, 1, url);
-  contents->TestDidNavigate(rvh, params);
-
-  // Reloading the page is not an in-page navigation.
-  EXPECT_FALSE(contents->TestIsInPageNavigation(url));
-  const GURL other_url("http://www.google.com/add.html");
-  EXPECT_FALSE(contents->TestIsInPageNavigation(other_url));
-  const GURL url_with_ref("http://www.google.com/home.html#my_ref");
-  EXPECT_TRUE(contents->TestIsInPageNavigation(url_with_ref));
-
-  // Navigate to URL with refs.
-  contents->controller()->LoadURL(url_with_ref, PageTransition::TYPED);
-  InitNavigateParams(&params, 2, url_with_ref);
-  contents->TestDidNavigate(rvh, params);
-
-  // Reloading the page is not an in-page navigation.
-  EXPECT_FALSE(contents->TestIsInPageNavigation(url_with_ref));
-  EXPECT_FALSE(contents->TestIsInPageNavigation(url));
-  EXPECT_FALSE(contents->TestIsInPageNavigation(other_url));
-  const GURL other_url_with_ref("http://www.google.com/home.html#my_other_ref");
-  EXPECT_TRUE(contents->TestIsInPageNavigation(other_url_with_ref));
-}
-
 // Tests to see that webkit preferences are properly loaded and copied over
 // to a WebPreferences object.
 TEST_F(WebContentsTest, WebKitPrefs) {
   WebPreferences webkit_prefs = contents->TestGetWebkitPrefs();
 
   // These values have been overridden by the profile preferences.
   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);
 }