cros: Fix loading user profile w/o UserSessionManager

chrome/browser/chromeos/profiles/profile_helper.cc

 // Copyright (c) 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/chromeos/profiles/profile_helper.h"
 
 #include "base/barrier_closure.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
@@ skipping 46 matching lines @@
  public:
   explicit UsernameHashMatcher(const std::string& h) : username_hash(h) {}
   bool operator()(const user_manager::User* user) const {
     return user->username_hash() == username_hash;
   }
 
  private:
   const std::string& username_hash;
 };
 
+// Internal helper to get an already-loaded user profile by user id hash. Return
+// nullptr if the user profile is not yet loaded.
+Profile* GetProfileByUserIdHash(const std::string& user_id_hash) {
+  return g_browser_process->profile_manager()->GetProfileByPath(
+      ProfileHelper::GetProfilePathByUserIdHash(user_id_hash));
+}
+
 }  // anonymous namespace
 
 // static
 bool ProfileHelper::enable_profile_to_user_testing = false;
 bool ProfileHelper::always_return_primary_user_for_testing = false;
 
 ////////////////////////////////////////////////////////////////////////////////
 // ProfileHelper, public
 
 ProfileHelper::ProfileHelper()
     : browsing_data_remover_(nullptr), weak_factory_(this) {
 }
 
 ProfileHelper::~ProfileHelper() {
   // Checking whether UserManager is initialized covers case
   // when ScopedTestUserManager is used.
   if (user_manager::UserManager::IsInitialized())
     user_manager::UserManager::Get()->RemoveSessionStateObserver(this);
 
   if (browsing_data_remover_)
     browsing_data_remover_->RemoveObserver(this);
 }
 
 // static
 ProfileHelper* ProfileHelper::Get() {
   return g_browser_process->platform_part()->profile_helper();
 }
 
 // static
-Profile* ProfileHelper::GetProfileByUserIdHash(
+Profile* ProfileHelper::GetProfileByUserIdHashForTest(
     const std::string& user_id_hash) {
-  ProfileManager* profile_manager = g_browser_process->profile_manager();
-  return profile_manager->GetProfile(GetProfilePathByUserIdHash(user_id_hash));
+  return g_browser_process->profile_manager()->GetProfile(
+      ProfileHelper::GetProfilePathByUserIdHash(user_id_hash));
 }
 
 // static
 base::FilePath ProfileHelper::GetProfilePathByUserIdHash(
     const std::string& user_id_hash) {
   // Fails for KioskTest.InstallAndLaunchApp test - crbug.com/238985
   // Will probably fail for Guest session / restart after a crash -
   // crbug.com/238998
   // TODO(nkostylev): Remove this check once these bugs are fixed.
   DCHECK(!user_id_hash.empty());
@@ skipping 175 matching lines @@
 Profile* ProfileHelper::GetProfileByUser(const user_manager::User* user) {
   // This map is non-empty only in tests.
   if (!user_to_profile_for_testing_.empty()) {
     std::map<const user_manager::User*, Profile*>::const_iterator it =
         user_to_profile_for_testing_.find(user);
     return it == user_to_profile_for_testing_.end() ? NULL : it->second;
   }
 
   if (!user->is_profile_created())
     return NULL;
-  Profile* profile =
-      ProfileHelper::GetProfileByUserIdHash(user->username_hash());
+  Profile* profile = GetProfileByUserIdHash(user->username_hash());
 
   // GetActiveUserProfile() or GetProfileByUserIdHash() returns a new instance
   // of ProfileImpl(), but actually its OffTheRecordProfile() should be used.
   if (user_manager::UserManager::Get()->IsLoggedInAsGuest())
     profile = profile->GetOffTheRecordProfile();
 
   return profile;
 }
 
 Profile* ProfileHelper::GetProfileByUserUnsafe(const user_manager::User* user) {
   // This map is non-empty only in tests.
   if (!user_to_profile_for_testing_.empty()) {
     std::map<const user_manager::User*, Profile*>::const_iterator it =
         user_to_profile_for_testing_.find(user);
     return it == user_to_profile_for_testing_.end() ? NULL : it->second;
   }
 
   Profile* profile = NULL;
   if (user->is_profile_created()) {
-    profile = ProfileHelper::GetProfileByUserIdHash(user->username_hash());
+    profile = GetProfileByUserIdHash(user->username_hash());
   } else {
     LOG(ERROR) << "ProfileHelper::GetProfileByUserUnsafe is called when "
                   "|user|'s profile is not created. It probably means that "
                   "something is wrong with a calling code. Please report in "
                   "http://crbug.com/361528 if you see this message.";
     profile = ProfileManager::GetActiveUserProfile();
   }
 
   // GetActiveUserProfile() or GetProfileByUserIdHash() returns a new instance
   // of ProfileImpl(), but actually its OffTheRecordProfile() should be used.
@@ skipping 170 matching lines @@
       DownloadPrefs::FromBrowserContext(profile)->DownloadPath());
   // Let extension system handle extension files.
   excludes.push_back(base::FilePath(extensions::kInstallDirectoryName));
   // Do not flush Drive cache.
   excludes.push_back(base::FilePath(chromeos::kDriveCacheDirname));
 
   profile_flusher_->RequestFlush(profile->GetPath(), excludes, base::Closure());
 }
 
 }  // namespace chromeos