Revert of Add account_type into AccountId

components/user_manager/known_user.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_USER_MANAGER_KNOWN_USER_H_
 #define COMPONENTS_USER_MANAGER_KNOWN_USER_H_
 
 #include <string>
 #include <vector>
 
 #include "components/user_manager/user_manager_export.h"
 
 class AccountId;
-enum class AccountType;
 class PrefRegistrySimple;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace user_manager {
 namespace known_user {
 // Methods for storage/retrieval of per-user properties in Local State.
 
@@ skipping 43 matching lines @@
                                         const std::string& path,
                                         const int in_value);
 
 // Returns the list of known AccountIds.
 std::vector<AccountId> USER_MANAGER_EXPORT GetKnownAccountIds();
 
 // This call forms full account id of a known user by email and (optionally)
 // gaia_id.
 // This is a temporary call while migrating to AccountId.
 AccountId USER_MANAGER_EXPORT GetAccountId(const std::string& user_email,
-                                           const std::string& id,
-                                           const AccountType& account_type);
+                                           const std::string& gaia_id);
 
 // Returns true if |subsystem| data was migrated to GaiaId for the |account_id|.
 bool USER_MANAGER_EXPORT GetGaiaIdMigrationStatus(const AccountId& account_id,
                                                   const std::string& subsystem);
 
 // Marks |subsystem| migrated to GaiaId for the |account_id|.
 void USER_MANAGER_EXPORT
 SetGaiaIdMigrationStatusDone(const AccountId& account_id,
                              const std::string& subsystem);
 
 // Updates |gaia_id| for user with |account_id|.
 // TODO(alemate): Update this once AccountId contains GAIA ID
 // (crbug.com/548926).
 void USER_MANAGER_EXPORT UpdateGaiaID(const AccountId& account_id,
                                       const std::string& gaia_id);
 
-// Updates |account_id.account_type_| and |account_id.GetGaiaId()| or
-// |account_id.GetObjGuid()| for user with |account_id|.
-void USER_MANAGER_EXPORT UpdateId(const AccountId& account_id);
-
 // Find GAIA ID for user with |account_id|, fill in |out_value| and return
 // true
 // if GAIA ID was found or false otherwise.
 // TODO(antrim): Update this once AccountId contains GAIA ID
 // (crbug.com/548926).
 bool USER_MANAGER_EXPORT FindGaiaID(const AccountId& account_id,
                                     std::string* out_value);
 
 // Setter and getter for DeviceId known user string preference.
 void USER_MANAGER_EXPORT SetDeviceId(const AccountId& account_id,
@@ skipping 30 matching lines @@
 // Removes all user preferences associated with |account_id|.
 // (This one used by user_manager only and thus not exported.)
 void RemovePrefs(const AccountId& account_id);
 
 // Register known user prefs.
 void USER_MANAGER_EXPORT RegisterPrefs(PrefRegistrySimple* registry);
 }
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_KNOWN_USER_H_