[Reland] GetAccountIdFromProfile() should not return an empty account id if a valid profile is prov…

chrome/browser/ui/ash/multi_user/multi_user_util.cc

 // Copyright 2013 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 "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 
-#include <vector>
-
-#include "base/strings/string_util.h"
-#include "build/build_config.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_manager.h"
-#include "google_apis/gaia/gaia_auth_util.h"
 
 namespace multi_user_util {
 
 AccountId GetAccountIdFromProfile(Profile* profile) {
-  return GetAccountIdFromEmail(
-      profile->GetOriginalProfile()->GetProfileUserName());
+  // This will guarantee an nonempty AccountId be returned if a valid profile is
+  // provided.
+  const user_manager::User* user =
+      chromeos::ProfileHelper::Get()->GetUserByProfile(
+          profile->GetOriginalProfile());
+  return user ? user->GetAccountId() : EmptyAccountId();
 }
 
 AccountId GetAccountIdFromEmail(const std::string& email) {
   // |email| and profile name could be empty if not yet logged in or guest mode.
   return email.empty() ? EmptyAccountId()
                        : AccountId::FromUserEmail(gaia::CanonicalizeEmail(
                              gaia::SanitizeEmail(email)));
 }
 
 Profile* GetProfileFromAccountId(const AccountId& account_id) {
-  // Unit tests can end up here without a |g_browser_process|.
-  if (!g_browser_process || !g_browser_process->profile_manager())
-    return nullptr;
-
-  std::vector<Profile*> profiles =
-      g_browser_process->profile_manager()->GetLoadedProfiles();
-
-  std::vector<Profile*>::const_iterator profile_iterator = profiles.begin();
-  for (; profile_iterator != profiles.end(); ++profile_iterator) {
-    if (GetAccountIdFromProfile(*profile_iterator) == account_id)
-      return *profile_iterator;
-  }
-
-  // If in a session the refresh token is revoked, GetAccountIdFromProfile()
-  // returns an empty account id which will cause the profile not being fetched
-  // properly. In this case we fall back to use GetProfileByUser() function.
-  // Note: If the refresh token is revoked because the user changes his GAIA
-  // password, we will force log out the user within 120 seconds. See crbug.com/
-  // 587318 for more detail.
   const user_manager::User* user =
       user_manager::UserManager::Get()->FindUser(account_id);
-  if (user)
-    return chromeos::ProfileHelper::Get()->GetProfileByUser(user);
-
-  return nullptr;
+  return user ? chromeos::ProfileHelper::Get()->GetProfileByUser(user)
+              : nullptr;
 }
 
 Profile* GetProfileFromWindow(aura::Window* window) {
   chrome::MultiUserWindowManager* manager =
       chrome::MultiUserWindowManager::GetInstance();
   // We might come here before the manager got created - or in a unit test.
   if (!manager)
     return nullptr;
   const AccountId account_id = manager->GetUserPresentingWindow(window);
   return account_id.is_valid() ? GetProfileFromAccountId(account_id) : nullptr;
@@ skipping 14 matching lines @@
 // Move the window to the current user's desktop.
 void MoveWindowToCurrentDesktop(aura::Window* window) {
   if (!chrome::MultiUserWindowManager::GetInstance()->IsWindowOnDesktopOfUser(
           window, GetCurrentAccountId())) {
     chrome::MultiUserWindowManager::GetInstance()->ShowWindowForUser(
         window, GetCurrentAccountId());
   }
 }
 
 }  // namespace multi_user_util