summaryrefslogtreecommitdiffstats
path: root/content/browser/browsing_instance.cc
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-02 21:13:46 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-02 21:13:46 +0000
commitfc72bb18b111ff63e57135d97de6d59291f3b7b8 (patch)
treef7fedf0a0577e38a0486e8bdc88a47a508bf122d /content/browser/browsing_instance.cc
parent7cd76fded67d66fb8ea4f5abce5241ad71d749a9 (diff)
downloadchromium_src-fc72bb18b111ff63e57135d97de6d59291f3b7b8.zip
chromium_src-fc72bb18b111ff63e57135d97de6d59291f3b7b8.tar.gz
chromium_src-fc72bb18b111ff63e57135d97de6d59291f3b7b8.tar.bz2
Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes BUG=110610 TBR=darin Review URL: https://chromiumcodereview.appspot.com/16294003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browsing_instance.cc')
-rw-r--r--content/browser/browsing_instance.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/content/browser/browsing_instance.cc b/content/browser/browsing_instance.cc
index d10ea20..c70f38b 100644
--- a/content/browser/browsing_instance.cc
+++ b/content/browser/browsing_instance.cc
@@ -45,8 +45,9 @@ SiteInstance* BrowsingInstance::GetSiteInstanceForURL(const GURL& url) {
}
void BrowsingInstance::RegisterSiteInstance(SiteInstance* site_instance) {
- DCHECK(static_cast<SiteInstanceImpl*>(site_instance)->
- browsing_instance_ == this);
+ DCHECK(static_cast<SiteInstanceImpl*>(site_instance)
+ ->browsing_instance_.get() ==
+ this);
DCHECK(static_cast<SiteInstanceImpl*>(site_instance)->HasSite());
std::string site = site_instance->GetSiteURL().possibly_invalid_spec();
@@ -63,8 +64,9 @@ void BrowsingInstance::RegisterSiteInstance(SiteInstance* site_instance) {
}
void BrowsingInstance::UnregisterSiteInstance(SiteInstance* site_instance) {
- DCHECK(static_cast<SiteInstanceImpl*>(site_instance)->
- browsing_instance_ == this);
+ DCHECK(static_cast<SiteInstanceImpl*>(site_instance)
+ ->browsing_instance_.get() ==
+ this);
DCHECK(static_cast<SiteInstanceImpl*>(site_instance)->HasSite());
std::string site = site_instance->GetSiteURL().possibly_invalid_spec();