diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 19:52:33 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 19:52:33 +0000 |
| commit | b658359fcbccccd57bb5448519ab3f9b1ff35531 (patch) | |
| tree | c72659685d2bdbe6151a7e2af704772bc0ee2b70 /content/browser/child_process_security_policy.cc | |
| parent | 5f5b937c2065a1028f5402474199043ce11f8858 (diff) | |
| download | chromium_src-b658359fcbccccd57bb5448519ab3f9b1ff35531.zip chromium_src-b658359fcbccccd57bb5448519ab3f9b1ff35531.tar.gz chromium_src-b658359fcbccccd57bb5448519ab3f9b1ff35531.tar.bz2 | |
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
Diffstat (limited to 'content/browser/child_process_security_policy.cc')
| -rw-r--r-- | content/browser/child_process_security_policy.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/content/browser/child_process_security_policy.cc b/content/browser/child_process_security_policy.cc index eeeac3f..4a305b1 100644 --- a/content/browser/child_process_security_policy.cc +++ b/content/browser/child_process_security_policy.cc @@ -10,13 +10,15 @@ #include "base/platform_file.h" #include "base/stl_util.h" #include "base/string_util.h" +#include "content/browser/site_instance_impl.h" #include "content/public/browser/content_browser_client.h" -#include "content/browser/site_instance.h" #include "content/public/common/bindings_policy.h" #include "content/public/common/url_constants.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request.h" +using content::SiteInstance; + static const int kReadFilePermissions = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ | @@ -103,7 +105,7 @@ class ChildProcessSecurityPolicy::SecurityState { bool CanUseCookiesForOrigin(const GURL& gurl) { if (origin_lock_.is_empty()) return true; - GURL site_gurl = SiteInstance::GetSiteForURL(NULL, gurl); + GURL site_gurl = SiteInstanceImpl::GetSiteForURL(NULL, gurl); return origin_lock_ == site_gurl; } @@ -478,7 +480,7 @@ bool ChildProcessSecurityPolicy::CanUseCookiesForOrigin(int child_id, void ChildProcessSecurityPolicy::LockToOrigin(int child_id, const GURL& gurl) { // "gurl" can be currently empty in some cases, such as file://blah. - DCHECK(SiteInstance::GetSiteForURL(NULL, gurl) == gurl); + DCHECK(SiteInstanceImpl::GetSiteForURL(NULL, gurl) == gurl); base::AutoLock lock(lock_); SecurityStateMap::iterator state = security_state_.find(child_id); DCHECK(state != security_state_.end()); |