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

chrome_frame/metrics_service.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
 //
@@ skipping 104 matching lines @@
     }
     return upload_thread;
   }
 };
 
 // ChromeFrame UMA uploads occur on this thread. This thread is started on the
 // IE UI thread. This thread needs to be stopped on the same thread it was
 // 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);
 
 Lock g_metrics_service_lock;
 
 extern base::LazyInstance<base::StatisticsRecorder> g_statistics_recorder_;
 
 // This class provides HTTP request context information for metrics upload
 // requests initiated by ChromeFrame.
 class ChromeFrameUploadRequestContext : public URLRequestContext {
@@ skipping 266 matching lines @@
   if (GetInstance()->state_ == ACTIVE)
     return;
 
   GetInstance()->InitializeMetricsState();
   GetInstance()->SetRecording(true);
   GetInstance()->SetReporting(true);
 }
 
 // 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) {
   if (enabled == recording_active_)
     return;
 
   if (enabled) {
     if (client_id_.empty()) {
       client_id_ = GenerateClientID();
       // Save client id somewhere.
@@ skipping 178 matching lines @@
     version += "-F";
     if (!version_info.IsOfficialBuild())
       version.append("-devel");
     return version;
   } else {
     NOTREACHED() << "Unable to retrieve version string.";
   }
 
   return std::string();
 }