Fix race with google variation ID registration

chrome/browser/android/data_usage/external_data_use_observer.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 "chrome/browser/android/data_usage/external_data_use_observer.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/field_trial.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 61 matching lines @@
           base::Bind(&DataUseTabModel::GetTrackingInfoForTabAtTime,
                      base::Unretained(data_use_tab_model_)),
           base::Bind(&ExternalDataUseObserverBridge::ReportDataUse,
                      base::Unretained(external_data_use_observer_bridge_)))),
       io_task_runner_(io_task_runner),
       ui_task_runner_(ui_task_runner),
       last_matching_rules_fetch_time_(base::TimeTicks::Now()),
       fetch_matching_rules_duration_(
           base::TimeDelta::FromSeconds(GetFetchMatchingRulesDurationSeconds())),
       registered_as_data_use_observer_(false),
+      profile_signin_status_(false),
       weak_factory_(this) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   DCHECK(data_use_aggregator_);
   DCHECK(io_task_runner_);
   DCHECK(ui_task_runner_);
 
   // Initialize the ExternalDataUseReporter object. It is okay to use
   // base::Unretained here since |external_data_use_reporter_| is owned by
   // |this|, and is destroyed on UI thread when |this| is destroyed.
   ui_task_runner_->PostTask(
@@ skipping 92 matching lines @@
   if (registered_as_data_use_observer_ == should_register)
     return;
 
   if (!registered_as_data_use_observer_ && should_register)
     data_use_aggregator_->AddObserver(this);
 
   if (registered_as_data_use_observer_ && !should_register)
     data_use_aggregator_->RemoveObserver(this);
 
   registered_as_data_use_observer_ = should_register;
+
+  // It is okay to use base::Unretained here since
+  // |external_data_use_observer_bridge_| is owned by |this|, and is destroyed
+  // on UI thread when |this| is destroyed.
+  ui_task_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&ExternalDataUseObserverBridge::RegisterGoogleVariationID,
+                 base::Unretained(external_data_use_observer_bridge_),
+                 registered_as_data_use_observer_ && profile_signin_status_));
 }
 
 void ExternalDataUseObserver::FetchMatchingRules() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   last_matching_rules_fetch_time_ = base::TimeTicks::Now();
 
   // It is okay to use base::Unretained here since
   // |external_data_use_observer_bridge_| is owned by |this|, and is destroyed
   // on UI thread when |this| is destroyed.
   ui_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&ExternalDataUseObserverBridge::FetchMatchingRules,
                  base::Unretained(external_data_use_observer_bridge_)));
 }
 
 base::WeakPtr<ExternalDataUseObserver> ExternalDataUseObserver::GetWeakPtr() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return weak_factory_.GetWeakPtr();
 }
 
 DataUseTabModel* ExternalDataUseObserver::GetDataUseTabModel() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return data_use_tab_model_;
 }
 
-void ExternalDataUseObserver::SetRegisterGoogleVariationID(
-    bool register_google_variation_id) {
+void ExternalDataUseObserver::SetProfileSigninStatus(bool signin_status) {
   DCHECK(thread_checker_.CalledOnValidThread());
+  profile_signin_status_ = signin_status;
+
   // It is okay to use base::Unretained here since
   // |external_data_use_observer_bridge_| is owned by |this|, and is destroyed
   // on UI thread when |this| is destroyed.
   ui_task_runner_->PostTask(
       FROM_HERE,
-      base::Bind(&ExternalDataUseObserverBridge::SetRegisterGoogleVariationID,
+      base::Bind(&ExternalDataUseObserverBridge::RegisterGoogleVariationID,
                  base::Unretained(external_data_use_observer_bridge_),
-                 register_google_variation_id));
+                 registered_as_data_use_observer_ && profile_signin_status_));
 }
 
 }  // namespace android
 
 }  // namespace chrome