Add account_id to signin manager notifications.

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 102 matching lines @@
   }
 }
 
 void SigninStatusMetricsProvider::SigninManagerShutdown(
     SigninManagerBase* manager) {
   if (scoped_observer_.IsObserving(manager))
     scoped_observer_.Remove(manager);
 }
 
 void SigninStatusMetricsProvider::GoogleSigninSucceeded(
+    const std::string& account_id,
     const std::string& username,
     const std::string& password) {
   if (signin_status_ == ALL_PROFILES_NOT_SIGNED_IN)
     signin_status_ = MIXED_SIGNIN_STATUS;
 }
 
-void SigninStatusMetricsProvider::GoogleSignedOut(const std::string& username) {
+void SigninStatusMetricsProvider::GoogleSignedOut(const std::string& account_id,
+                                                  const std::string& username) {
   if (signin_status_ == ALL_PROFILES_SIGNED_IN)
     signin_status_ = MIXED_SIGNIN_STATUS;
 }
 
 void SigninStatusMetricsProvider::Initialize() {
   // Add observers.
 #if !defined(OS_ANDROID)
   // On Android, there is always only one profile in any situation, opening new
   // windows (which is possible with only some Android devices) will not change
   // the opened profiles signin status.
@@ skipping 73 matching lines @@
     if (manager && manager->IsAuthenticated())
       signed_in_profiles_count++;
   }
   UpdateInitialSigninStatus(opened_profiles_count, signed_in_profiles_count);
 }
 
 SigninStatusMetricsProvider::ProfilesSigninStatus
 SigninStatusMetricsProvider::GetSigninStatusForTesting() {
   return signin_status_;
 }