Set the site instance in all cases when we start a new load. If you navigate ...

chrome/browser/tab_contents/render_view_host_manager_unittest.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/render_view_host_manager.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/test_notification_tracker.h"
@@ skipping 211 matching lines @@
 // Tests DOMUI creation.
 TEST_F(RenderViewHostManagerTest, DOMUI) {
   ChromeThread ui_thread(ChromeThread::UI, MessageLoop::current());
   SiteInstance* instance = SiteInstance::CreateSiteInstance(profile_.get());
 
   TestTabContents tab_contents(profile_.get(), instance);
   RenderViewHostManager manager(&tab_contents, &tab_contents);
 
   manager.Init(profile_.get(), instance, MSG_ROUTING_NONE);
 
-  GURL url("chrome://newtab");
+  GURL url(chrome::kChromeUINewTabURL);
   NavigationEntry entry(NULL /* instance */, -1 /* page_id */, url,
                         GURL() /* referrer */, string16() /* title */,
                         PageTransition::TYPED);
   RenderViewHost* host = manager.Navigate(entry);
 
   EXPECT_TRUE(host);
   EXPECT_TRUE(host == manager.current_host());
   EXPECT_FALSE(manager.pending_render_view_host());
   EXPECT_TRUE(manager.pending_dom_ui());
   EXPECT_FALSE(manager.dom_ui());
 
+  // It's important that the site instance get set on the DOM UI page as soon
+  // as the navigation starts, rather than lazily after it commits, so we don't
+  // try to re-use the SiteInstance/process for non DOM-UI things that may
+  // get loaded in between.
+  EXPECT_TRUE(host->site_instance()->has_site());
+  EXPECT_EQ(url, host->site_instance()->site());
+
   // Commit.
   manager.DidNavigateMainFrame(host);
 
   EXPECT_FALSE(manager.pending_dom_ui());
   EXPECT_TRUE(manager.dom_ui());
 }