[signin] Support for CrOS and OAuth2AccessTokenConsumer services.

chrome/browser/signin/signin_internals_util.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/signin_internals_util.h"
 
 #include <sstream>
 
 #include "base/hash.h"
 #include "base/logging.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "google_apis/gaia/gaia_constants.h"
 
 namespace signin_internals_util {
 
 const char kSigninPrefPrefix[] = "google.services.signin.";
 const char kTokenPrefPrefix[] = "google.services.signin.tokens.";
 const char kChromeToMobileToken[] = "ChromeToMobile";
 const char kAppNotifyChannelSetupToken[] = "AppNotifyChannelSetup";
-const char kOperationsBaseToken[] = "OperationsBase";
-const char kUserPolicySigninServiceToken[] = "UserCloudPolicyManagerToken";
+const char kAuthOperationToken[] = "AuthOperation";
+const char kUserPolicySigninServiceToken[] = "UserCloudPolicyManager";
 const char kProfileDownloaderToken[] = "ProfileDownloader";
 
 // TODO(vishwath): These two services need their information plumbed to
-// about:signin-internals.
+// about:signin-internals, and then added to the array below.
 const char kObfuscatedGaiaIdFetcherToken[] = "ObfuscatedGaiaIdFetcher";
 const char kOAuth2MintTokenFlowToken[] = "OAuth2MintTokenFlow";
+
 const char* kTokenPrefsArray[] = {
   GaiaConstants::kGaiaService,
   GaiaConstants::kSyncService,
   GaiaConstants::kDeviceManagementService,
   GaiaConstants::kLSOService,
   GaiaConstants::kGaiaOAuth2LoginRefreshToken,
   GaiaConstants::kGaiaOAuth2LoginAccessToken,
   kChromeToMobileToken,
   kAppNotifyChannelSetupToken,
-  kOperationsBaseToken,
+  kAuthOperationToken,
   kUserPolicySigninServiceToken,
   kProfileDownloaderToken,
-  kObfuscatedGaiaIdFetcherToken,
-  kOAuth2MintTokenFlowToken
 };
 
 const size_t kNumTokenPrefs = arraysize(kTokenPrefsArray);
 
 TokenInfo::TokenInfo(const std::string& tok,
                      const std::string& stat,
                      const std::string & tstamp,
                      const std::string srvice)
     : token(tok)
     , status(stat)
@@ skipping 211 matching lines @@
   for (std::map<std::string, TokenInfo>::iterator it = token_info_map.begin();
        it != token_info_map.end(); ++it) {
     DictionaryValue* token_info = it->second.ToValue();
     token_details->Append(token_info);
   }
 
   return signin_status.Pass();
 }
 
 } //  namespace signin_internals_util