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

Unified Diff: chrome/browser/safe_browsing/srt_global_error_win.cc

Issue 2409443002: Make GlobalErrorService's ownership model slightly less insane. (Closed)
Patch Set: less Created 4 years, 2 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
Index: chrome/browser/safe_browsing/srt_global_error_win.cc
diff --git a/chrome/browser/safe_browsing/srt_global_error_win.cc b/chrome/browser/safe_browsing/srt_global_error_win.cc
index 3b134fd47995eb49afe900abbdf0f13e82eb5945..06896dda205414d866aed96ff6fdda54e043e379 100644
--- a/chrome/browser/safe_browsing/srt_global_error_win.cc
+++ b/chrome/browser/safe_browsing/srt_global_error_win.cc
@@ -218,8 +218,8 @@ void SRTGlobalError::MaybeExecuteSRT() {
return;
}
// At this point, this object owns itself, since ownership has been taken back
- // from the global_error_service_ in the call to RemoveGlobalError. This means
- // that it is safe to use base::Unretained here.
+ // from the global_error_service_ in the call to OnUserInteractionStarted.
+ // This means that it is safe to use base::Unretained here.
BrowserThread::PostBlockingPoolTask(
FROM_HERE,
base::Bind(
@@ -259,7 +259,7 @@ void SRTGlobalError::OnUserinteractionStarted(
RecordSRTPromptHistogram(histogram_value);
interacted_ = true;
if (global_error_service_) {
- global_error_service_->RemoveGlobalError(this);
+ global_error_service_->RemoveOwnedGlobalError(this).release();
global_error_service_ = nullptr;
}
}

Powered by Google App Engine
This is Rietveld 408576698