chrome/browser/profiles/off_the_record_profile_impl.cc - Issue 16296002: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/profiles/off_the_record_profile_impl.cc

Issue 16296002: Update chrome/ 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 | « chrome/browser/profile_resetter/profile_resetter_unittest.cc ('k') | chrome/browser/profiles/off_the_record_profile_io_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/off_the_record_profile_impl.cc

diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc

index 842a30d82fc9b8735d0b323d3056209469d1ad79..6fd6e94f42a981e371d046ca7b609a64f9d1362e 100644

--- a/chrome/browser/profiles/off_the_record_profile_impl.cc

+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc

@@ -148,7 +148,7 @@ OffTheRecordProfileImpl::~OffTheRecordProfileImpl() {

BrowserThread::IO, FROM_HERE,

base::Bind(&NotifyOTRProfileDestroyedOnIOThread, profile_, this));

- if (host_content_settings_map_)

+ if (host_content_settings_map_.get())

host_content_settings_map_->ShutdownOnUIThread();

if (pref_proxy_config_tracker_)

@@ -305,7 +305,7 @@ HostContentSettingsMap* OffTheRecordProfileImpl::GetHostContentSettingsMap() {

// Retrieve the host content settings map of the parent profile in order to

// ensure the preferences have been migrated.

profile_->GetHostContentSettingsMap();

- if (!host_content_settings_map_) {

+ if (!host_content_settings_map_.get()) {

host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), true);

#if defined(ENABLE_EXTENSIONS)

ExtensionService* extension_service = GetExtensionService();