chrome/browser/profile_resetter/resettable_settings_snapshot.cc - Issue 511473002: Remove implicit conversions from scoped_refptr to T* in chrome/

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/profile_resetter/resettable_settings_snapshot.cc

Issue 511473002: Remove implicit conversions from scoped_refptr to T* in chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move download out Created 6 years, 4 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/safe_browsing/incident_reporting/incident_reporting_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profile_resetter/resettable_settings_snapshot.cc

diff --git a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc

index 5d2fedb050f31ba44add6302c884c8e51fee94f5..439153c017971521a2614ebc6f37b3f8b21d76ff 100644

--- a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc

+++ b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc

@@ -90,7 +90,7 @@ ResettableSettingsSnapshot::ResettableSettingsSnapshot(

ResettableSettingsSnapshot::~ResettableSettingsSnapshot() {

DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

- if (cancellation_flag_)

+ if (cancellation_flag_.get())

cancellation_flag_->data.Set();

}

@@ -134,7 +134,7 @@ int ResettableSettingsSnapshot::FindDifferentFields(

void ResettableSettingsSnapshot::RequestShortcuts(

const base::Closure& callback) {

DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

- DCHECK(!cancellation_flag_ && !shortcuts_determined());

+ DCHECK(!cancellation_flag_.get() && !shortcuts_determined());

cancellation_flag_ = new SharedCancellationFlag;

content::BrowserThread::PostTaskAndReplyWithResult(