Add account id/gaia id to sign-in internals page.

components/signin/core/browser/signin_manager.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 "components/signin/core/browser/signin_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/metrics/histogram.h"
@@ skipping 87 matching lines @@
 void SigninManager::InitTokenService() {
   if (token_service_ && IsAuthenticated())
     token_service_->LoadCredentials(GetAuthenticatedAccountId());
 }
 
 std::string SigninManager::SigninTypeToString(SigninManager::SigninType type) {
   switch (type) {
     case SIGNIN_TYPE_NONE:
       return "No Signin";
     case SIGNIN_TYPE_WITH_REFRESH_TOKEN:
-      return "Signin with refresh token";
+      return "With refresh token";
   }
 
   NOTREACHED();
   return std::string();
 }
 
 bool SigninManager::PrepareForSignin(SigninType type,
                                      const std::string& username,
                                      const std::string& password) {
   DCHECK(possibly_invalid_username_.empty() ||
@@ skipping 11 matching lines @@
   // 2) trying to refresh credentials for an existing username.  If it is 2, we
   // need to try again, but take care to leave state around tracking that the
   // user has successfully signed in once before with this username, so that on
   // restart we don't think sync setup has never completed.
   ClearTransientSigninData();
   type_ = type;
   possibly_invalid_username_.assign(username);
   password_.assign(password);
   signin_manager_signed_in_ = false;
   user_info_fetched_by_account_tracker_ = false;
-  NotifyDiagnosticsObservers(SIGNIN_TYPE, SigninTypeToString(type));
+  NotifyDiagnosticsObservers(SIGNIN_STARTED, SigninTypeToString(type));
   return true;
 }
 
 void SigninManager::StartSignInWithRefreshToken(
     const std::string& refresh_token,
     const std::string& username,
     const std::string& password,
     const OAuthTokenFetchedCallback& callback) {
   DCHECK(!IsAuthenticated() ||
          gaia::AreEmailsSame(username, GetAuthenticatedUsername()));
 
   if (!PrepareForSignin(SIGNIN_TYPE_WITH_REFRESH_TOKEN, username, password))
     return;
 
   // Store our callback and token.
   temp_refresh_token_ = refresh_token;
   possibly_invalid_username_ = username;
 
-  NotifyDiagnosticsObservers(GET_USER_INFO_STATUS, "Successful");
-
   if (!callback.is_null() && !temp_refresh_token_.empty()) {
     callback.Run(temp_refresh_token_);
   } else {
     // No oauth token or callback, so just complete our pending signin.
     CompletePendingSignin();
   }
 }
 
 void SigninManager::CopyCredentialsFrom(const SigninManager& source) {
   DCHECK_NE(this, &source);
@@ skipping 51 matching lines @@
   const std::string username = GetAuthenticatedUsername();
   const base::Time signin_time =
       base::Time::FromInternalValue(
           client_->GetPrefs()->GetInt64(prefs::kSignedInTime));
   ClearAuthenticatedUsername();
   client_->GetPrefs()->ClearPref(prefs::kGoogleServicesHostedDomain);
   client_->GetPrefs()->ClearPref(prefs::kGoogleServicesUsername);
   client_->GetPrefs()->ClearPref(prefs::kSignedInTime);
   client_->OnSignedOut();
 
-  // Erase (now) stale information from AboutSigninInternals.
-  NotifyDiagnosticsObservers(USERNAME, "");
-
   // Determine the duration the user was logged in and log that to UMA.
   if (!signin_time.is_null()) {
     base::TimeDelta signed_in_duration = base::Time::Now() - signin_time;
     UMA_HISTOGRAM_COUNTS("Signin.SignedInDurationBeforeSignout",
                          signed_in_duration.InMinutes());
   }
 
   // Revoke all tokens before sending signed_out notification, because there
   // may be components that don't listen for token service events when the
   // profile is not connected to an account.
@@ skipping 137 matching lines @@
   }
 
   merge_session_helper_.reset(new MergeSessionHelper(
       token_service_, GaiaConstants::kChromeSource,
       client_->GetURLRequestContext(), this));
 
   merge_session_helper_->LogIn(GetAuthenticatedAccountId());
 }
 
 void SigninManager::CompletePendingSignin() {
+  NotifyDiagnosticsObservers(SIGNIN_COMPLETED, "Successful");
+
   DCHECK(!possibly_invalid_username_.empty());
   OnSignedIn(possibly_invalid_username_);
 
   DCHECK(!temp_refresh_token_.empty());
   DCHECK(IsAuthenticated());
   token_service_->UpdateCredentials(GetAuthenticatedAccountId(),
                                     temp_refresh_token_);
   temp_refresh_token_.clear();
 
   MergeSigninCredentialIntoCookieJar();
@@ skipping 48 matching lines @@
 void SigninManager::OnAccountUpdateFailed(const std::string& account_id) {
   user_info_fetched_by_account_tracker_ = true;
   PostSignedIn();
 }
 
 void SigninManager::ProhibitSignout(bool prohibit_signout) {
   prohibit_signout_ = prohibit_signout;
 }
 
 bool SigninManager::IsSignoutProhibited() const { return prohibit_signout_; }