Rename AccountId method GetGaiaIdKey() to GetAccountIdKey().

components/signin/core/account_id/account_id.cc

 // 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.
 
 #include "components/signin/core/account_id/account_id.h"
 
 #include <functional>
 #include <memory>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
 namespace {
 
 // Known account types.
 const char kGoogle[] = "google";
 
 // Serialization keys
 const char kGaiaIdKey[] = "gaia_id";
 const char kEmailKey[] = "email";
 
-// Prefix for GetGaiaIdKey().
+// Prefix for GetAccountIdKey().
 const char kKeyGaiaIdPrefix[] = "g-";
 
 struct GoogleStringSingleton {
   GoogleStringSingleton() : google(kGoogle) {}
 
   static GoogleStringSingleton* GetInstance() {
     return base::Singleton<GoogleStringSingleton>::get();
   }
 
   const std::string google;
@@ skipping 61 matching lines @@
 }
 
 const std::string& AccountId::GetGaiaId() const {
   return gaia_id_;
 }
 
 const std::string& AccountId::GetUserEmail() const {
   return user_email_;
 }
 
-const std::string AccountId::GetGaiaIdKey() const {
+const std::string AccountId::GetAccountIdKey() const {
 #ifdef NDEBUG
   if (gaia_id_.empty())
-    LOG(FATAL) << "GetGaiaIdKey(): no gaia id for " << Serialize();
+    LOG(FATAL) << "GetAccountIdKey(): no gaia id for " << Serialize();
 
 #else
   CHECK(!gaia_id_.empty());
 #endif
 
   return std::string(kKeyGaiaIdPrefix) + gaia_id_;
 }
 
 void AccountId::SetGaiaId(const std::string& gaia_id) {
   DCHECK(!gaia_id.empty());
@@ skipping 68 matching lines @@
   return AccountId::EmptyAccountId::GetInstance()->user_id;
 }
 
 namespace BASE_HASH_NAMESPACE {
 
 std::size_t hash<AccountId>::operator()(const AccountId& user_id) const {
   return hash<std::string>()(user_id.GetUserEmail());
 }
 
 }  // namespace BASE_HASH_NAMESPACE