Rename AccountId method GetGaiaIdKey() to GetAccountIdKey().

components/signin/core/account_id/account_id.h

 // Copyright 2015 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.
 
 #ifndef COMPONENTS_SIGNIN_CORE_ACCOUNT_ID_ACCOUNT_ID_H_
 #define COMPONENTS_SIGNIN_CORE_ACCOUNT_ID_ACCOUNT_ID_H_
 
 #include <stddef.h>
 
 #include <string>
@@ skipping 15 matching lines @@
   bool operator!=(const AccountId& other) const;
   bool operator<(const AccountId& right) const;
 
   // empty() is deprecated. Use !is_valid() instead.
   bool empty() const;
   bool is_valid() const;
   void clear();
 
   const std::string& GetAccountType() const;
   const std::string& GetGaiaId() const;
+  // Users of AccountId should make no assumptions on the format of email.
+  // I.e. it cannot be used as account identifier, because it is (in general)
+  // non-comparable.
   const std::string& GetUserEmail() const;
 
-  // This returns prefixed GaiaId string to be used as a storage key.
-  const std::string GetGaiaIdKey() const;
+  // This returns prefixed some string that can be used as a storage key.
+  // You should make no assumptions on the format of this string.
+  const std::string GetAccountIdKey() const;
 
   void SetGaiaId(const std::string& gaia_id);
   void SetUserEmail(const std::string& email);
 
   // This method is to be used during transition period only.
   static AccountId FromUserEmail(const std::string& user_email);
   // This method is to be used during transition period only.
   static AccountId FromGaiaId(const std::string& gaia_id);
   // This method is the preferred way to construct AccountId if you have
   // full account information.
@@ skipping 23 matching lines @@
 
 // Implement hashing of AccountId, so it can be used as a key in STL containers.
 template <>
 struct hash<AccountId> {
   std::size_t operator()(const AccountId& user_id) const;
 };
 
 }  // namespace BASE_HASH_NAMESPACE
 
 #endif  // COMPONENTS_SIGNIN_CORE_ACCOUNT_ID_ACCOUNT_ID_H_