chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc - Issue 1107863002: [chrome/browser/profile_resetter] favor DCHECK_CURRENTLY_ON for better logs

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/automatic_profile_resetter_delegate.cc

Issue 1107863002: [chrome/browser/profile_resetter] favor DCHECK_CURRENTLY_ON for better logs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 8 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/automatic_profile_resetter.cc ('k') | chrome/browser/profile_resetter/profile_resetter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc

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

index 02948a385a43c68a76dc5a4ba5bb4ec29e3d94d3..b120f7cdcd4b3fe9f021e73c1328172cb3b4d364 100644

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

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

@@ -305,7 +305,7 @@ void AutomaticProfileResetterDelegateImpl::TriggerProfileSettingsReset(

}

void AutomaticProfileResetterDelegateImpl::OnTemplateURLServiceChanged() {

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

+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);

DCHECK(template_url_service_);

if (template_url_service_->loaded() &&

!template_url_service_ready_event_.is_signaled())

@@ -328,7 +328,7 @@ void AutomaticProfileResetterDelegateImpl::Observe(

int type,

const content::NotificationSource& source,

const content::NotificationDetails& details) {

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

+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);

if (type == chrome::NOTIFICATION_MODULE_LIST_ENUMERATED &&

!modules_have_been_enumerated_event_.is_signaled()) {

#if defined(OS_WIN)

@@ -364,7 +364,7 @@ void AutomaticProfileResetterDelegateImpl::RunProfileSettingsReset(

void AutomaticProfileResetterDelegateImpl::

OnBrandcodedDefaultsFetched() {

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

+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);

DCHECK(brandcoded_config_fetcher_);

DCHECK(!brandcoded_config_fetcher_->IsActive());

brandcoded_defaults_ = brandcoded_config_fetcher_->GetSettings();

@@ -376,7 +376,7 @@ void AutomaticProfileResetterDelegateImpl::

void AutomaticProfileResetterDelegateImpl::OnProfileSettingsResetCompleted(

const base::Closure& user_callback,

scoped_ptr<ResettableSettingsSnapshot> old_settings_snapshot) {

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

+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);

if (old_settings_snapshot) {

ResettableSettingsSnapshot new_settings_snapshot(profile_);

int difference =