Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Unified Diff: content/browser/browsing_instance.cc

Issue 16294003: Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/browser_thread_impl.cc ('k') | content/browser/cert_store_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browsing_instance.cc
diff --git a/content/browser/browsing_instance.cc b/content/browser/browsing_instance.cc
index d10ea209b2f0bd44bc9be0959c3524a9155db5e3..c70f38b9daaf5b32d64799e439b5b391024a5552 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();
« no previous file with comments | « content/browser/browser_thread_impl.cc ('k') | content/browser/cert_store_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698