ChromeOS: This CL fixes bug in UserManager::GetKnownUserAccountId .

components/user_manager/user_manager.h

 // Copyright 2014 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_USER_MANAGER_H_
 #define COMPONENTS_USER_MANAGER_USER_MANAGER_H_
 
 #include <string>
 
 #include "components/user_manager/user.h"
@@ skipping 345 matching lines @@
   // fills in |out_value|. Otherwise returns false.
   virtual bool GetKnownUserIntegerPref(const AccountId& account_id,
                                        const std::string& path,
                                        int* out_value) = 0;
 
   // Updates user's identified by |account_id| integer preference |path|.
   virtual void SetKnownUserIntegerPref(const AccountId& account_id,
                                        const std::string& path,
                                        const int in_value) = 0;
 
-  // Returns true if user's AccountId was found.
-  // Returns it in |out_account_id|.
-  virtual bool GetKnownUserAccountId(const AccountId& authenticated_account_id,
-                                     AccountId* out_account_id) = 0;
+  // 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.
+  virtual AccountId GetKnownUserAccountIdImpl(const std::string& user_email,
+                                              const std::string& gaia_id) = 0;
+
+  // The same as above, but doesn't crash in unit_tests when Usermanager
+  // doesn't exist.
+  static AccountId GetKnownUserAccountId(const std::string& user_email,
+                                         const std::string& gaia_id);
 
   // Updates |gaia_id| for user with |account_id|.
   // TODO(alemate): Update this once AccountId contains GAIA ID
   // (crbug.com/548926).
   virtual void UpdateGaiaID(const AccountId& account_id,
                             const std::string& gaia_id) = 0;
 
   // Find GAIA ID for user with |account_id|, fill in |out_value| and return
   // true
   // if GAIA ID was found or false otherwise.
@@ skipping 51 matching lines @@
   static UserManager* GetForTesting();
 
   // Sets UserManager instance to the given |user_manager|.
   // Returns the previous value of the instance.
   static UserManager* SetForTesting(UserManager* user_manager);
 };
 
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_USER_MANAGER_H_