Fix a race in the ChromeFrame metrics service start up code. This race could ...

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 79 matching lines @@
 
 // The first UMA upload occurs after this interval.
 static const int kInitialUMAUploadTimeoutMilliSeconds = 30000;
 
 // Default to one UMA upload per 10 mins.
 static const int kMinMilliSecondsPerUMAUpload = 600000;
 
 base::LazyInstance<MetricsService>
     g_metrics_instance_(base::LINKER_INITIALIZED);
 
+Lock MetricsService::metrics_service_lock_;
+
 // Traits to create an instance of the ChromeFrame upload thread.
 struct UploadThreadInstanceTraits
     : public base::LeakyLazyInstanceTraits<base::Thread> {
   static base::Thread* New(void* instance) {
     // Use placement new to initialize our instance in our preallocated space.
     // The parenthesis is very important here to force POD type initialization.
     base::Thread* upload_thread =
         new (instance) base::Thread("ChromeFrameUploadThread");
     base::Thread::Options options;
     options.message_loop_type = MessageLoop::TYPE_IO;
@@ skipping 261 matching lines @@
     current_log_ = NULL;
   }
 }
 
 void MetricsService::InitializeMetricsState() {
   DCHECK(state_ == INITIALIZED);
 
   thread_ = PlatformThread::CurrentId();
 
   user_permits_upload_ = GoogleUpdateSettings::GetCollectStatsConsent();
+  user_permits_upload_ = true;
   // Update session ID
   session_id_ = CrashMetricsReporter::GetInstance()->IncrementMetric(
       CrashMetricsReporter::SESSION_ID);
 
   // Ensure that an instance of the StatisticsRecorder object is created.
   g_statistics_recorder_.Get();
 
   if (user_permits_upload_) {
     // Ensure that an instance of the metrics upload thread is created.
     g_metrics_upload_thread_.Get();
   }
 
   CrashMetricsReporter::GetInstance()->set_active(true);
 }
 
 // static
 void MetricsService::Start() {
+  AutoLock lock(metrics_service_lock_);
+
   if (GetInstance()->state_ == ACTIVE)
     return;
 
   GetInstance()->InitializeMetricsState();
   GetInstance()->SetRecording(true);
   GetInstance()->SetReporting(true);
 }
 
 // static
 void MetricsService::Stop() {
+  AutoLock lock(metrics_service_lock_);
+
   GetInstance()->SetReporting(false);
   GetInstance()->SetRecording(false);
 }
 
 void MetricsService::SetRecording(bool enabled) {
   if (enabled == recording_active_)
     return;
 
   if (enabled) {
     if (client_id_.empty()) {
@@ skipping 180 matching lines @@
     version += "-F";
     if (!version_info.IsOfficialBuild())
       version.append("-devel");
     return version;
   } else {
     NOTREACHED() << "Unable to retrieve version string.";
   }
 
   return std::string();
 }