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

components/user_manager/user_manager.cc

 // 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.
 
 #include "components/user_manager/user_manager.h"
 
 #include "base/logging.h"
+#include "chromeos/login/user_names.h"
+#include "components/signin/core/account_id/account_id.h"
 
 namespace user_manager {
 
 UserManager* UserManager::instance = NULL;
 
 UserManager::Observer::~Observer() {
 }
 
 void UserManager::Observer::LocalStateChanged(UserManager* user_manager) {
 }
@@ skipping 60 matching lines @@
   return UserManager::instance;
 }
 
 // static
 UserManager* UserManager::SetForTesting(UserManager* user_manager) {
   UserManager* previous_instance = UserManager::instance;
   UserManager::instance = user_manager;
   return previous_instance;
 }
 
+// static
+AccountId UserManager::GetKnownUserAccountId(const std::string& user_email,
+                                             const std::string& gaia_id) {
+  // In tests empty accounts are possible.
+  if (user_email.empty() && gaia_id.empty())
+    return EmptyAccountId();
+
+  if (user_email == chromeos::login::kStubUser)
+    return chromeos::login::StubAccountId();
+
+  if (user_email == chromeos::login::kGuestUserName)
+    return chromeos::login::GuestAccountId();
+
+  UserManager* user_manager = Get();
+  if (user_manager)
+    return user_manager->GetKnownUserAccountIdImpl(user_email, gaia_id);
+
+  // This is fallback for tests.
+  return (gaia_id.empty()
+              ? AccountId::FromUserEmail(user_email)
+              : AccountId::FromUserEmailGaiaId(user_email, gaia_id));
+}
+
 }  // namespace user_manager