Define the public interface for content browser SiteInstance. This interface is implemented by th...

content/browser/tab_contents/render_view_host_manager_unittest.cc

Index: content/browser/tab_contents/render_view_host_manager_unittest.cc
===================================================================
--- content/browser/tab_contents/render_view_host_manager_unittest.cc	(revision 118703)
+++ content/browser/tab_contents/render_view_host_manager_unittest.cc	(working copy)
@@ -6,7 +6,7 @@
 #include "content/browser/browser_url_handler.h"
 #include "content/browser/mock_content_browser_client.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
-#include "content/browser/site_instance.h"
+#include "content/browser/site_instance_impl.h"
 #include "content/browser/tab_contents/navigation_controller_impl.h"
 #include "content/browser/tab_contents/navigation_entry_impl.h"
 #include "content/browser/tab_contents/render_view_host_manager.h"
@@ -198,8 +198,8 @@
   // The two RVH's should be different in every way.
   EXPECT_NE(active_rvh()->process(), dest_rvh2->process());
   EXPECT_NE(active_rvh()->site_instance(), dest_rvh2->site_instance());
-  EXPECT_NE(active_rvh()->site_instance()->browsing_instance_,
-            dest_rvh2->site_instance()->browsing_instance_);
+  EXPECT_NE(active_rvh()->site_instance()->GetBrowsingInstance(),
+            dest_rvh2->site_instance()->GetBrowsingInstance());
 
   // Navigate both to the new tab page, and verify that they share a
   // SiteInstance.
@@ -272,8 +272,9 @@
 // Tests the Init function by checking the initial RenderViewHost.
 TEST_F(RenderViewHostManagerTest, Init) {
   // Using TestBrowserContext.
-  SiteInstance* instance = SiteInstance::CreateSiteInstance(browser_context());
-  EXPECT_FALSE(instance->has_site());
+  content::SiteInstance* instance =
+      content::SiteInstance::CreateSiteInstance(browser_context());
+  EXPECT_FALSE(instance->HasSite());
 
   TestTabContents tab_contents(browser_context(), instance);
   RenderViewHostManager manager(&tab_contents, &tab_contents);
@@ -293,7 +294,8 @@
 TEST_F(RenderViewHostManagerTest, Navigate) {
   TestNotificationTracker notifications;
 
-  SiteInstance* instance = SiteInstance::CreateSiteInstance(browser_context());
+  content::SiteInstance* instance =
+      content::SiteInstance::CreateSiteInstance(browser_context());
 
   TestTabContents tab_contents(browser_context(), instance);
   notifications.ListenFor(
@@ -325,7 +327,7 @@
   // Commit to SiteInstance should be delayed until RenderView commit.
   EXPECT_TRUE(host == manager.current_host());
   ASSERT_TRUE(host);
-  EXPECT_FALSE(host->site_instance()->has_site());
+  EXPECT_FALSE(host->site_instance()->HasSite());
   host->site_instance()->SetSite(kUrl1);
 
   // 2) Navigate to next site. -------------------------
@@ -345,7 +347,7 @@
   manager.DidNavigateMainFrame(host);
   EXPECT_TRUE(host == manager.current_host());
   ASSERT_TRUE(host);
-  EXPECT_TRUE(host->site_instance()->has_site());
+  EXPECT_TRUE(host->site_instance()->HasSite());
 
   // 3) Cross-site navigate to next site. --------------
   const GURL kUrl3("http://webkit.org/");
@@ -366,7 +368,7 @@
   manager.DidNavigateMainFrame(manager.pending_render_view_host());
   EXPECT_TRUE(host == manager.current_host());
   ASSERT_TRUE(host);
-  EXPECT_TRUE(host->site_instance()->has_site());
+  EXPECT_TRUE(host->site_instance()->HasSite());
   // Check the pending RenderViewHost has been committed.
   EXPECT_FALSE(manager.pending_render_view_host());
 
@@ -382,7 +384,8 @@
 TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) {
   TestNotificationTracker notifications;
 
-  SiteInstance* instance = SiteInstance::CreateSiteInstance(browser_context());
+  content::SiteInstance* instance =
+      content::SiteInstance::CreateSiteInstance(browser_context());
 
   TestTabContents tab_contents(browser_context(), instance);
   notifications.ListenFor(
@@ -418,7 +421,7 @@
   // Commit to SiteInstance should be delayed until RenderView commit.
   EXPECT_TRUE(host == manager.current_host());
   ASSERT_TRUE(host);
-  EXPECT_FALSE(host->site_instance()->has_site());
+  EXPECT_FALSE(host->site_instance()->HasSite());
   host->site_instance()->SetSite(kUrl1);
 
   // 2) Cross-site navigate to next site. -------------------------
@@ -502,7 +505,7 @@
   manager.DidNavigateMainFrame(host3);
   EXPECT_TRUE(host3 == manager.current_host());
   ASSERT_TRUE(host3);
-  EXPECT_TRUE(host3->site_instance()->has_site());
+  EXPECT_TRUE(host3->site_instance()->HasSite());
   // Check the pending RenderViewHost has been committed.
   EXPECT_FALSE(manager.pending_render_view_host());
 
@@ -515,7 +518,8 @@
 TEST_F(RenderViewHostManagerTest, WebUI) {
   set_should_create_webui(true);
   BrowserThreadImpl ui_thread(BrowserThread::UI, MessageLoop::current());
-  SiteInstance* instance = SiteInstance::CreateSiteInstance(browser_context());
+  content::SiteInstance* instance =
+      content::SiteInstance::CreateSiteInstance(browser_context());
 
   TestTabContents tab_contents(browser_context(), instance);
   RenderViewHostManager manager(&tab_contents, &tab_contents);
@@ -537,8 +541,8 @@
   // 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(kUrl, host->site_instance()->site());
+  EXPECT_TRUE(host->site_instance()->HasSite());
+  EXPECT_EQ(kUrl, host->site_instance()->GetSite());
 
   // The Web UI is committed immediately because the RenderViewHost has not been
   // used yet. UpdateRendererStateForNavigate() took the short cut path.
@@ -555,7 +559,8 @@
 // Regression test for bug 46290.
 TEST_F(RenderViewHostManagerTest, NonWebUIChromeURLs) {
   BrowserThreadImpl thread(BrowserThread::UI, &message_loop_);
-  SiteInstance* instance = SiteInstance::CreateSiteInstance(browser_context());
+  content::SiteInstance* instance =
+      content::SiteInstance::CreateSiteInstance(browser_context());
   TestTabContents tab_contents(browser_context(), instance);
   RenderViewHostManager manager(&tab_contents, &tab_contents);
   manager.Init(browser_context(), instance, MSG_ROUTING_NONE);