Add account_id to signin manager notifications.

chrome/browser/signin/fake_signin_manager.cc

 // Copyright (c) 2012 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/signin/fake_signin_manager.h"
 
 #include "base/callback_helpers.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
@@ skipping 45 matching lines @@
   if (!oauth_fetched_callback.is_null())
     oauth_fetched_callback.Run(refresh_token);
 }
 
 
 void FakeSigninManager::CompletePendingSignin() {
   SetAuthenticatedUsername(GetUsernameForAuthInProgress());
   set_auth_in_progress(std::string());
   FOR_EACH_OBSERVER(Observer,
                     observer_list_,
-                    GoogleSigninSucceeded(authenticated_username_, password_));
+                    GoogleSigninSucceeded(authenticated_username_,
+                                          authenticated_username_,
+                                          password_));
 }
 
 void FakeSigninManager::AddMergeSessionObserver(
     MergeSessionHelper::Observer* observer) {
   SigninManager::AddMergeSessionObserver(observer);
   merge_session_observer_list_.AddObserver(observer);
 }
 
 void FakeSigninManager::RemoveMergeSessionObserver(
     MergeSessionHelper::Observer* observer) {
@@ skipping 17 matching lines @@
 void FakeSigninManager::FailSignin(const GoogleServiceAuthError& error) {
   FOR_EACH_OBSERVER(Observer, observer_list_, GoogleSigninFailed(error));
 }
 
 void FakeSigninManager::SignOut(
     signin_metrics::ProfileSignout signout_source_metric) {
   if (IsSignoutProhibited())
     return;
   set_auth_in_progress(std::string());
   set_password(std::string());
+  const std::string account_id = GetAuthenticatedAccountId();
   const std::string username = authenticated_username_;
   authenticated_username_.clear();
 
   FOR_EACH_OBSERVER(SigninManagerBase::Observer, observer_list_,
-                    GoogleSignedOut(username));
+                    GoogleSignedOut(account_id, username));
 }
 
 #endif  // !defined (OS_CHROMEOS)