Allow SiteInstance for about:blank in new tab to be reused.

content/browser/tab_contents/tab_contents_unittest.cc

 // Copyright (c) 2012 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 "base/utf_string_conversions.h"
 #include "content/browser/mock_content_browser_client.h"
 #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"
@@ skipping 954 matching lines @@
   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);
   entry = controller().GetLastCommittedEntry();
   EXPECT_FALSE(entry->GetContentState().empty());
 }
 
-// Test that NavigationEntries have the correct content state after opening
-// a new window to about:blank.  Prevents regression for bug 1116137.
+// Test that NavigationEntries have the correct content state and SiteInstance
+// state after opening a new window to about:blank.  Prevents regression for
+// bugs b/1116137 and http://crbug.com/111975.
 TEST_F(TabContentsTest, NavigationEntryContentStateNewWindow) {
   TestRenderViewHost* orig_rvh = rvh();
 
   // 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, content::PAGE_TRANSITION_TYPED);
 
   // Should have a content state here.
   NavigationEntry* entry = controller().GetLastCommittedEntry();
   EXPECT_FALSE(entry->GetContentState().empty());
+
+  // The SiteInstance should be available for other navigations to use.
+  NavigationEntryImpl* entry_impl =
+      NavigationEntryImpl::FromNavigationEntry(entry);
+  EXPECT_FALSE(entry_impl->site_instance()->HasSite());
+  int32 site_instance_id = entry_impl->site_instance()->GetId();
+
+  // Navigating to a normal page should not cause a process swap.
+  const GURL newUrl("http://www.google.com");

[darin (slow to review), 2012/01/30 22:12:38]

nit: new_url

+  controller().LoadURL(
+      url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());
+  EXPECT_FALSE(contents()->cross_navigation_pending());
+  EXPECT_EQ(orig_rvh, contents()->GetRenderViewHost());
+  contents()->TestDidNavigate(orig_rvh, 1, newUrl,
+                              content::PAGE_TRANSITION_TYPED);
+  NavigationEntryImpl* entry_impl2 = NavigationEntryImpl::FromNavigationEntry(
+      controller().GetLastCommittedEntry());
+  EXPECT_EQ(site_instance_id, entry_impl2->site_instance()->GetId());
+  EXPECT_TRUE(entry_impl2->site_instance()->HasSite());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Interstitial Tests
 ////////////////////////////////////////////////////////////////////////////////
 
 // Test navigating to a page (with the navigation initiated from the browser,
 // as when a URL is typed in the location bar) that shows an interstitial and
 // creates a new navigation entry, then hiding it without proceeding.
 TEST_F(TabContentsTest,
@@ skipping 839 matching lines @@
 
   // It should have a transient entry.
   EXPECT_TRUE(other_controller.GetTransientEntry());
 
   // And the interstitial should be showing.
   EXPECT_TRUE(other_contents->ShowingInterstitialPage());
 
   // And the interstitial should do a reload on don't proceed.
   EXPECT_TRUE(other_contents->GetInterstitialPage()->reload_on_dont_proceed());
 }