Starting a refactor to allow adding metrics on upload.

chrome/browser/metrics/signin_status_metrics_provider.cc

 // Copyright 2014 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/metrics/signin_status_metrics_provider.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 53 matching lines @@
 
 #if !defined(OS_ANDROID)
   BrowserList::RemoveObserver(this);
 #endif
 
   SigninManagerFactory* factory = SigninManagerFactory::GetInstance();
   if (factory)
     factory->RemoveObserver(this);
 }
 
-void SigninStatusMetricsProvider::RecordSigninStatusHistogram() {
+void SigninStatusMetricsProvider::ProvideGeneralMetrics(
+    metrics::ChromeUserMetricsExtension* uma_proto) {
   UMA_HISTOGRAM_ENUMERATION(
       "UMA.ProfileSignInStatus", signin_status_, SIGNIN_STATUS_MAX);
   // After a histogram value is recorded, a new UMA session will be started, so
   // we need to re-check the current sign-in status regardless of the previous
   // recorded |signin_status_| value.
   signin_status_ = UNKNOWN_SIGNIN_STATUS;
   ComputeCurrentSigninStatus();
 }
 
 // static
@@ skipping 109 matching lines @@
     SetSigninStatus(MIXED_SIGNIN_STATUS);
   }
 }
 
 void SigninStatusMetricsProvider::UpdateStatusWhenBrowserAdded(bool signed_in) {
 #if !defined(OS_ANDROID)
   if ((signin_status_ == ALL_PROFILES_NOT_SIGNED_IN && signed_in) ||
       (signin_status_ == ALL_PROFILES_SIGNED_IN && !signed_in)) {
     SetSigninStatus(MIXED_SIGNIN_STATUS);
   } else if (signin_status_ == UNKNOWN_SIGNIN_STATUS) {
-    // If when function RecordSigninStatusHistogram() is called, Chrome is
+    // If when function ProvideGeneralMetrics() is called, Chrome is
     // running in the background with no browser window opened, |signin_status_|
     // will be reset to |UNKNOWN_SIGNIN_STATUS|. Then this newly added browser
     // is the only opened browser/profile and its signin status represents
     // the whole status.
     SetSigninStatus(signed_in ? ALL_PROFILES_SIGNED_IN :
                                 ALL_PROFILES_NOT_SIGNED_IN);
   }
 #endif
 }
 
@@ skipping 39 matching lines @@
     RecordComputeSigninStatusHistogram(TRY_TO_OVERRIDE_ERROR_STATUS);
     return;
   }
   signin_status_ = new_status;
 }
 
 SigninStatusMetricsProvider::ProfilesSigninStatus
 SigninStatusMetricsProvider::GetSigninStatusForTesting() {
   return signin_status_;
 }