cros: Fix loading user profile w/o UserSessionManager

chrome/browser/chromeos/file_manager/file_manager_browsertest.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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
@@ skipping 597 matching lines @@
   // Loads all users to the current session and sets up necessary fields.
   // This is used for preparing all accounts in PRE_ test setup, and for testing
   // actual login behavior.
   void AddAllUsers() {
     for (size_t i = 0; i < arraysize(kTestAccounts); ++i)
       AddUser(kTestAccounts[i], i >= SECONDARY_ACCOUNT_INDEX_START);
   }
 
   // Returns primary profile (if it is already created.)
   Profile* profile() override {
-    Profile* const profile = chromeos::ProfileHelper::GetProfileByUserIdHash(
-        kTestAccounts[PRIMARY_ACCOUNT_INDEX].hash);
+    Profile* const profile =
+        chromeos::ProfileHelper::GetProfileByUserIdHashForTest(
+            kTestAccounts[PRIMARY_ACCOUNT_INDEX].hash);
     return profile ? profile : FileManagerBrowserTestBase::profile();
   }
 
   // Sets the test case name (used as a function name in test_cases.js to call.)
   void set_test_case_name(const std::string& name) { test_case_name_ = name; }
 
   // Adds a new user for testing to the current session.
   void AddUser(const TestAccountInfo& info, bool log_in) {
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     const AccountId account_id(AccountId::FromUserEmail(info.email));
     if (log_in) {
       session_manager::SessionManager::Get()->CreateSession(account_id,
                                                             info.hash);
     }
     user_manager::UserManager::Get()->SaveUserDisplayName(
         account_id, base::UTF8ToUTF16(info.display_name));
     SigninManagerFactory::GetForProfile(
-        chromeos::ProfileHelper::GetProfileByUserIdHash(info.hash))
+        chromeos::ProfileHelper::GetProfileByUserIdHashForTest(info.hash))
         ->SetAuthenticatedAccountInfo(info.gaia_id, info.email);
   }
 
  private:
   GuestMode GetGuestModeParam() const override { return NOT_IN_GUEST_MODE; }
   const char* GetTestManifestName() const override {
     return "file_manager_test_manifest.json";
   }
   const char* GetTestCaseNameParam() const override {
     return test_case_name_.c_str();
@@ skipping 40 matching lines @@
 #endif
 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) {
   AddAllUsers();
 
   // Sanity check that normal operations work in multi-profile setting as well.
   set_test_case_name("keyboardCopyDrive");
   StartTest();
 }
 
 }  // namespace file_manager