Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3534)

Unified Diff: chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

Issue 2918203002: cros: Fix loading user profile w/o UserSessionManager (Closed)
Patch Set: rebase Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
index b1d908bcf8299e725b50093dfb1062930c3c8261..e2c0c02c3be81929f4e6d975c588040014c786e9 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
@@ -615,8 +615,9 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase {
// 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();
}
@@ -634,7 +635,7 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase {
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);
}

Powered by Google App Engine
This is Rietveld 408576698