[Signin] Rename obfuscated_gaia_id into gaia_id

components/signin/core/browser/dice_header_helper.cc

 // Copyright 2017 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/dice_header_helper.h"
 
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 32 matching lines @@
   DiceResponseParams params;
   ResponseHeaderDictionary header_dictionary =
       ParseAccountConsistencyResponseHeader(header_value);
   ResponseHeaderDictionary::const_iterator it = header_dictionary.begin();
   for (; it != header_dictionary.end(); ++it) {
     const std::string key_name(it->first);
     const std::string value(it->second);
     if (key_name == kActionAttrName) {
       params.user_intention = GetDiceActionFromHeader(value);
     } else if (key_name == kIdAttrName) {
-      params.obfuscated_gaia_id = value;
+      params.gaia_id = value;
     } else if (key_name == kEmailAttrName) {
       params.email = value;
     } else if (key_name == kAuthUserAttrName) {
       bool parse_success = base::StringToInt(value, &params.session_index);
       if (!parse_success)
         params.session_index = -1;
     } else if (key_name == kAuthorizationCodeAttrName) {
       params.authorization_code = value;
     } else {
       DLOG(WARNING) << "Unexpected Gaia header attribute '" << key_name << "'.";
     }
   }
 
-  if (params.obfuscated_gaia_id.empty() || params.email.empty() ||
+  if (params.gaia_id.empty() || params.email.empty() ||
       params.session_index == -1) {
     DLOG(WARNING) << "Missing parameters for Dice header.";
     params.user_intention = DiceAction::NONE;
   }
 
   if (params.user_intention == DiceAction::SIGNIN &&
       params.authorization_code.empty()) {
     DLOG(WARNING) << "Missing authorization code for Dice SIGNIN.";
     params.user_intention = DiceAction::NONE;
   }
@@ skipping 13 matching lines @@
                                                  bool sync_enabled) {
   std::vector<std::string> parts;
   parts.push_back("client_id=" +
                   GaiaUrls::GetInstance()->oauth2_chrome_client_id());
   if (sync_enabled)
     parts.push_back("sync_account_id=" + account_id);
   return base::JoinString(parts, ",");
 }
 
 }  // namespace signin