From 16ab7a05769c7cbfe25f2865cb54c027b493f307 Mon Sep 17 00:00:00 2001 From: "holte@chromium.org" Date: Mon, 24 Feb 2014 23:30:46 +0000 Subject: Only enable Rappor for UMA users Also, destroy the RapporService during TearDown to clean up URLFetchers properly. BUG=328168 Review URL: https://codereview.chromium.org/170313007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253024 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/browser_process_impl.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'chrome/browser/browser_process_impl.cc') diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index fcf727f..39be6e1 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -218,13 +218,14 @@ void BrowserProcessImpl::StartTearDown() { BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind(&SdchDictionaryFetcher::Shutdown)); - // We need to destroy the MetricsService, VariationsService, + // We need to destroy the MetricsService, RapporService, VariationsService, // IntranetRedirectDetector, PromoResourceService, and SafeBrowsing // ClientSideDetectionService (owned by the SafeBrowsingService) 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(); + rappor_service_.reset(); variations_service_.reset(); intranet_redirect_detector_.reset(); #if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING) -- cgit v1.1