Add an Accounts in Token Service section to about:signin-internals.

components/signin/core/browser/about_signin_internals.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 "components/signin/core/browser/about_signin_internals.h"
 
 #include "base/command_line.h"
 #include "base/hash.h"
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
@@ skipping 229 matching lines @@
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile05(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "422460 AboutSigninInternals::NotifyObservers 0.5"));
 
   scoped_ptr<base::DictionaryValue> signin_status_value =
       signin_status_.ToValue(account_tracker_,
                              signin_manager_,
                              signin_error_controller_,
+                             token_service_,
                              product_version);
 
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile1(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "422460 AboutSigninInternals::NotifyObservers1"));
 
   FOR_EACH_OBSERVER(AboutSigninInternals::Observer,
                     signin_observers_,
                     OnSigninStateChanged(signin_status_value.get()));
 }
 
 scoped_ptr<base::DictionaryValue> AboutSigninInternals::GetSigninStatus() {
   return signin_status_.ToValue(account_tracker_,
                                 signin_manager_,
                                 signin_error_controller_,
+                                token_service_,
                                 client_->GetProductVersion()).Pass();
 }
 
 void AboutSigninInternals::OnAccessTokenRequested(
     const std::string& account_id,
     const std::string& consumer_id,
     const OAuth2TokenService::ScopeSet& scopes) {
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile(
@@ skipping 135 matching lines @@
     : consumer_id(consumer_id),
       scopes(scopes),
       request_time(base::Time::Now()),
       error(GoogleServiceAuthError::AuthErrorNone()),
       removed_(false) {}
 
 AboutSigninInternals::TokenInfo::~TokenInfo() {}
 
 bool AboutSigninInternals::TokenInfo::LessThan(const TokenInfo* a,
                                                const TokenInfo* b) {
-  return a->consumer_id < b->consumer_id ||
-      (a->consumer_id == b->consumer_id && a->scopes < b->scopes);
+  if (a->request_time == b->request_time) {
+    if (a->consumer_id == b->consumer_id) {
+      return a->scopes < b->scopes;
+    }
+    return a->consumer_id < b->consumer_id;
+  }
+  return a->request_time < b->request_time;
 }
 
 void AboutSigninInternals::TokenInfo::Invalidate() { removed_ = true; }
 
 base::DictionaryValue* AboutSigninInternals::TokenInfo::ToValue() const {
   scoped_ptr<base::DictionaryValue> token_info(new base::DictionaryValue());
   token_info->SetString("service", consumer_id);
 
   std::string scopes_str;
   for (OAuth2TokenService::ScopeSet::const_iterator it = scopes.begin();
@@ skipping 51 matching lines @@
     if (tmp->consumer_id == consumer_id && tmp->scopes == scopes)
       return tmp;
   }
   return NULL;
 }
 
 scoped_ptr<base::DictionaryValue> AboutSigninInternals::SigninStatus::ToValue(
     AccountTrackerService* account_tracker,
     SigninManagerBase* signin_manager,
     SigninErrorController* signin_error_controller,
+    ProfileOAuth2TokenService* token_service,
     const std::string& product_version) {
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile1(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "422460 AboutSigninInternals::SigninStatus::ToValue1"));
 
   scoped_ptr<base::DictionaryValue> signin_status(new base::DictionaryValue());
   base::ListValue* signin_info = new base::ListValue();
   signin_status->Set("signin_info", signin_info);
@@ skipping 97 matching lines @@
     tracked_objects::ScopedTracker tracking_profile43(
         FROM_HERE_WITH_EXPLICIT_FUNCTION(
             "422460 AboutSigninInternals::SigninStatus::ToValue43"));
 
     for (size_t i = 0; i < tokens.size(); ++i) {
       base::DictionaryValue* token_info = tokens[i]->ToValue();
       token_details->Append(token_info);
     }
   }
 
+  base::ListValue* account_info = new base::ListValue();
+  signin_status->Set("accountInfo", account_info);
+  const std::vector<std::string>& accounts_in_token_service =
+      token_service->GetAccounts();
+
+  if(accounts_in_token_service.size() == 0) {
+    base::DictionaryValue* no_token_entry = new base::DictionaryValue();
+    no_token_entry->SetString("accountId", "No token in Token Service.");
+    account_info->Append(no_token_entry);
+  }
+
+  for(const std::string& account_id : accounts_in_token_service) {
+    base::DictionaryValue* entry = new base::DictionaryValue();
+    entry->SetString("accountId", account_id);
+    account_info->Append(entry);
+  }
+
   return signin_status.Pass();
 }