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

Unified Diff: chrome/browser/browser_process_impl.cc

Issue 6298004: Fix a possible crash in the ClientSideDetectionService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 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/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 30ecd9a173c9a662809bddca7933902ba40b5251..0acf6a36ae91ca93780a69c18bace4fcbbb35f37 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -146,14 +146,16 @@ BrowserProcessImpl::~BrowserProcessImpl() {
// any pending URLFetchers, and avoid creating any more.
SdchDictionaryFetcher::Shutdown();
- // We need to destroy the MetricsService, GoogleURLTracker, and
- // IntranetRedirectDetector before the io_thread_ gets destroyed, since their
- // destructors can call the URLFetcher destructor, which does a
- // PostDelayedTask operation on the IO thread. (The IO thread will handle
- // that URLFetcher operation before going away.)
+ // We need to destroy the MetricsService, GoogleURLTracker,
+ // IntranetRedirectDetector, and SafeBrowsing ClientSideDetectionService
+ // before the io_thread_ gets destroyed, since their destructors can call the
+ // URLFetcher destructor, which does a PostDelayedTask operation on the IO
+ // thread. (The IO thread will handle that URLFetcher operation before going
+ // away.)
metrics_service_.reset();
google_url_tracker_.reset();
intranet_redirect_detector_.reset();
+ safe_browsing_detection_service_.reset();
// Need to clear the desktop notification balloons before the io_thread_ and
// before the profiles, since if there are any still showing we will access

Powered by Google App Engine
This is Rietveld 408576698