Fix race condition-y Finalize w/ extreme predjudice

android_webview/browser/aw_metrics_service_client.cc

 // Copyright 2015 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.
 
 #include "android_webview/browser/aw_metrics_service_client.h"
 
 #include "android_webview/common/aw_version_info_values.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/guid.h"
@@ skipping 46 matching lines @@
   *guid = base::GenerateGUID();
   if (!base::WriteFile(guid_file_path, guid->c_str(), guid->size()))
     LOG(ERROR) << "Failed to write new GUID";
   return;
 }
 
 }  // namespace
 
 // static
 AwMetricsServiceClient* AwMetricsServiceClient::GetInstance() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   return g_lazy_instance_.Pointer();
 }
 
 void AwMetricsServiceClient::Initialize(
     PrefService* pref_service,
     net::URLRequestContextGetter* request_context,
     const base::FilePath guid_file_path) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(!is_initialized_);
 
   pref_service_ = pref_service;
   request_context_ = request_context;
 
   std::string* guid = new std::string;
   // Initialization happens on the UI thread, but getting the GUID should happen
   // on the file I/O thread. So we start to initialize, then post to get the
   // GUID, and then pick up where we left off, back on the UI thread, in
   // InitializeWithGUID.
   content::BrowserThread::PostTaskAndReply(
       content::BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&GetOrCreateGUID, guid_file_path, guid),
       base::Bind(&AwMetricsServiceClient::InitializeWithGUID,
                  base::Unretained(this), base::Owned(guid)));
 }
 
 void AwMetricsServiceClient::InitializeWithGUID(std::string* guid) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(!is_initialized_);
 
   pref_service_->SetString(metrics::prefs::kMetricsClientID, *guid);
 
   metrics_state_manager_ = metrics::MetricsStateManager::Create(
       pref_service_, base::Bind(&AwMetricsServiceClient::is_reporting_enabled,
                                 base::Unretained(this)),
       base::Bind(&StoreClientInfo), base::Bind(&LoadClientInfo));
 
   metrics_service_.reset(new ::metrics::MetricsService(
@@ skipping 19 matching lines @@
           new metrics::CallStackProfileMetricsProvider));
 
   metrics_service_->InitializeMetricsRecordingState();
 
   is_initialized_ = true;
 
   if (is_reporting_enabled())
     metrics_service_->Start();
 }
 
-void AwMetricsServiceClient::Finalize() {
-  DCHECK(is_initialized_);
-  metrics_service_->Stop();
-}
+void AwMetricsServiceClient::SetMetricsEnabled(bool enabled) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-void AwMetricsServiceClient::SetMetricsEnabled(bool enabled) {
   // If the client is already initialized, apply the setting immediately.
   // Otherwise, it will be applied on initialization.
   if (is_initialized_ && is_enabled_ != enabled) {
     if (enabled)
       metrics_service_->Start();
     else
       metrics_service_->Stop();
   }
   is_enabled_ = enabled;
 }
@@ skipping 75 matching lines @@
       request_context_(nullptr) {}
 
 AwMetricsServiceClient::~AwMetricsServiceClient() {}
 
 bool AwMetricsServiceClient::is_reporting_enabled() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   return is_enabled_;
 }
 
 }  // namespace android_webview