Stop upload thread when stopping service. Leaked thread may crash process on exit.

BUG=64388
TEST=none


Review URL: http://codereview.chromium.org/5845004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69516 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 4 deletions

diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc
index 387305f..d82e16b 100644
--- a/chrome_frame/metrics_service.cc
+++ b/chrome_frame/metrics_service.cc
@@ -123,7 +123,8 @@ struct UploadThreadInstanceTraits
 // started on. We don't have a good way of achieving this at this point. This
 // thread object is currently leaked.
 // TODO(ananta)
-// Fix this.
+// TODO(vitalybuka@chromium.org) : Fix this by using MetricsService::Stop() in
+// appropriate location.
 base::LazyInstance<base::Thread, UploadThreadInstanceTraits>
     g_metrics_upload_thread_(base::LINKER_INITIALIZED);
 
@@ -414,10 +415,15 @@ void MetricsService::Start() {
 
 // static
 void MetricsService::Stop() {
-  AutoLock lock(metrics_service_lock_);
+  {
+    AutoLock lock(metrics_service_lock_);
+
+    GetInstance()->SetReporting(false);
+    GetInstance()->SetRecording(false);
+  }
 
-  GetInstance()->SetReporting(false);
-  GetInstance()->SetRecording(false);
+  if (GetInstance()->user_permits_upload_)
+    g_metrics_upload_thread_.Get().Stop();
 }
 
 void MetricsService::SetRecording(bool enabled) {