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

content/browser/tab_contents/navigation_controller_impl_unittest.cc

Index: content/browser/tab_contents/navigation_controller_impl_unittest.cc
===================================================================
--- content/browser/tab_contents/navigation_controller_impl_unittest.cc	(revision 118703)
+++ content/browser/tab_contents/navigation_controller_impl_unittest.cc	(working copy)
@@ -17,7 +17,7 @@
 //  #include "chrome/browser/sessions/session_service_test_helper.h"
 //  #include "chrome/browser/sessions/session_types.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/tab_contents.h"
@@ -63,7 +63,7 @@
                          controller));
 }
 
-SiteInstance* GetSiteInstanceFromEntry(NavigationEntry* entry) {
+content::SiteInstance* GetSiteInstanceFromEntry(NavigationEntry* entry) {
   return NavigationEntryImpl::FromNavigationEntry(entry)->site_instance();
 }
 
@@ -760,8 +760,9 @@
 
   // We know all the entries have the same site instance, so we can just grab
   // a random one for looking up other entries.
-  SiteInstance* site_instance = NavigationEntryImpl::FromNavigationEntry(
-      controller.GetLastCommittedEntry())->site_instance();
+  content::SiteInstance* site_instance =
+      NavigationEntryImpl::FromNavigationEntry(
+          controller.GetLastCommittedEntry())->site_instance();
 
   // That second URL should be the last committed and it should have gotten the
   // new title.
@@ -1578,7 +1579,7 @@
   EXPECT_EQ(url,
             NavigationEntryImpl::FromNavigationEntry(
                 our_controller.GetLastCommittedEntry())->site_instance()->
-                    site());
+                    GetSite());
   EXPECT_EQ(NavigationEntryImpl::RESTORE_NONE,
             NavigationEntryImpl::FromNavigationEntry(
                 our_controller.GetEntryAtIndex(0))->restore_type());
@@ -1658,7 +1659,7 @@
   EXPECT_EQ(url,
             NavigationEntryImpl::FromNavigationEntry(
                 our_controller.GetLastCommittedEntry())->site_instance()->
-                    site());
+                    GetSite());
   EXPECT_EQ(NavigationEntryImpl::RESTORE_NONE,
             NavigationEntryImpl::FromNavigationEntry(
                 our_controller.GetEntryAtIndex(0))->restore_type());
@@ -2063,9 +2064,9 @@
   NavigateAndCommit(url2);
 
   // First two entries should have the same SiteInstance.
-  SiteInstance* instance1 =
+  content::SiteInstance* instance1 =
       GetSiteInstanceFromEntry(controller.GetEntryAtIndex(0));
-  SiteInstance* instance2 =
+  content::SiteInstance* instance2 =
       GetSiteInstanceFromEntry(controller.GetEntryAtIndex(1));
   EXPECT_EQ(instance1, instance2);
   EXPECT_EQ(0, controller.GetEntryAtIndex(0)->GetPageID());
@@ -2095,7 +2096,7 @@
   EXPECT_EQ(0, other_controller.GetEntryAtIndex(2)->GetPageID());
 
   // A new SiteInstance should be used for the new tab.
-  SiteInstance* instance3 =
+  content::SiteInstance* instance3 =
       GetSiteInstanceFromEntry(other_controller.GetEntryAtIndex(2));
   EXPECT_NE(instance3, instance1);
 
@@ -2134,7 +2135,7 @@
 
   // The max page ID map should be copied over and updated with the max page ID
   // from the current tab.
-  SiteInstance* instance1 =
+  content::SiteInstance* instance1 =
       GetSiteInstanceFromEntry(other_controller.GetEntryAtIndex(0));
   EXPECT_EQ(0, other_contents->GetMaxPageIDForSiteInstance(instance1));
 }
@@ -2175,7 +2176,7 @@
 
   // The max page ID map should be copied over and updated with the max page ID
   // from the current tab.
-  SiteInstance* instance1 =
+  content::SiteInstance* instance1 =
       GetSiteInstanceFromEntry(other_controller.GetEntryAtIndex(0));
   EXPECT_EQ(0, other_contents->GetMaxPageIDForSiteInstance(instance1));
 }