Define the public interface for content browser SiteInstance. This interface is implemented by the SiteInstanceImpl class which lives

in content\browser\site_instance.cc/.h.

Changes as part of creating a content API.

BUG=98716
TEST=No change in functionality. Hopefully it all compiles and works.
Review URL: http://codereview.chromium.org/8515027
Review URL: https://chromiumcodereview.appspot.com/9146028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119102 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 9 insertions, 4 deletions

diff --git a/chrome/browser/tabs/default_tab_handler.cc b/chrome/browser/tabs/default_tab_handler.cc
index d7f7ec3..f8f46d70 100644
--- a/chrome/browser/tabs/default_tab_handler.cc
+++ b/chrome/browser/tabs/default_tab_handler.cc
@@ -7,6 +7,8 @@
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 
+using content::SiteInstance;
+
 ////////////////////////////////////////////////////////////////////////////////
 // DefaultTabHandler, public:
 
diff --git a/chrome/browser/tabs/default_tab_handler.h b/chrome/browser/tabs/default_tab_handler.h
index d5e7e8d..a866a4a 100644
--- a/chrome/browser/tabs/default_tab_handler.h
+++ b/chrome/browser/tabs/default_tab_handler.h
@@ -42,7 +42,7 @@ class DefaultTabHandler : public TabHandler,
       Profile* profile,
       content::PageTransition transition,
       bool defer_load,
-      SiteInstance* instance) const OVERRIDE;
+      content::SiteInstance* instance) const OVERRIDE;
   virtual bool CanDuplicateContentsAt(int index) OVERRIDE;
   virtual void DuplicateContentsAt(int index) OVERRIDE;
   virtual void CloseFrameAfterDragSession() OVERRIDE;
diff --git a/chrome/browser/tabs/tab_strip_model_delegate.h b/chrome/browser/tabs/tab_strip_model_delegate.h
index 1c8e00e..0f552fd 100644
--- a/chrome/browser/tabs/tab_strip_model_delegate.h
+++ b/chrome/browser/tabs/tab_strip_model_delegate.h
@@ -14,10 +14,10 @@ class Browser;
 class DockInfo;
 class GURL;
 class Profile;
-class SiteInstance;
 class TabContents;
 class TabContentsWrapper;
 namespace content {
+class SiteInstance;
 struct Referrer;
 }
 namespace gfx {
@@ -72,7 +72,7 @@ class TabStripModelDelegate {
       Profile* profile,
       content::PageTransition transition,
       bool defer_load,
-      SiteInstance* instance) const = 0;
+      content::SiteInstance* instance) const = 0;
 
   // Returns whether some contents can be duplicated.
   virtual bool CanDuplicateContentsAt(int index) = 0;
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc
index 3a12732..681cc34 100644
--- a/chrome/browser/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/tabs/tab_strip_model_unittest.cc
@@ -43,6 +43,7 @@
 
 using content::BrowserThread;
 using content::NavigationController;
+using content::SiteInstance;
 using content::WebContents;
 using testing::_;
 
diff --git a/chrome/browser/tabs/test_tab_strip_model_delegate.cc b/chrome/browser/tabs/test_tab_strip_model_delegate.cc
index f7955f6..f87201c 100644
--- a/chrome/browser/tabs/test_tab_strip_model_delegate.cc
+++ b/chrome/browser/tabs/test_tab_strip_model_delegate.cc
@@ -9,6 +9,8 @@
 #include "chrome/browser/ui/tabs/dock_info.h"
 #include "ui/gfx/rect.h"
 
+using content::SiteInstance;
+
 TestTabStripModelDelegate::TestTabStripModelDelegate() {
 }
 
diff --git a/chrome/browser/tabs/test_tab_strip_model_delegate.h b/chrome/browser/tabs/test_tab_strip_model_delegate.h
index 15f0b5c..486ea56 100644
--- a/chrome/browser/tabs/test_tab_strip_model_delegate.h
+++ b/chrome/browser/tabs/test_tab_strip_model_delegate.h
@@ -31,7 +31,7 @@ class TestTabStripModelDelegate : public TabStripModelDelegate {
       Profile* profile,
       content::PageTransition transition,
       bool defer_load,
-      SiteInstance* instance) const OVERRIDE;
+      content::SiteInstance* instance) const OVERRIDE;
   virtual bool CanDuplicateContentsAt(int index) OVERRIDE;
   virtual void DuplicateContentsAt(int index) OVERRIDE;
   virtual void CloseFrameAfterDragSession() OVERRIDE;