diff options
| author | holte@chromium.org <holte@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-24 23:30:46 +0000 |
|---|---|---|
| committer | holte@chromium.org <holte@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-24 23:30:46 +0000 |
| commit | 16ab7a05769c7cbfe25f2865cb54c027b493f307 (patch) | |
| tree | 780dd9c6e125b198e45ddf8797a18a51d99c663c /chrome/browser/browser_process_impl.cc | |
| parent | dd864bcb077c584a6bb9a11af61cbd6777cfb109 (diff) | |
| download | chromium_src-16ab7a05769c7cbfe25f2865cb54c027b493f307.zip chromium_src-16ab7a05769c7cbfe25f2865cb54c027b493f307.tar.gz chromium_src-16ab7a05769c7cbfe25f2865cb54c027b493f307.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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) |