cros: Fix loading user profile w/o UserSessionManager

chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "ash/accessibility_types.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/chromeos/login/helper.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/prefs/pref_service.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/user_prefs/user_prefs.h"
@@ skipping 67 matching lines @@
 
 // Creates and logs into a profile with account |account_id|, and makes sure
 // that the profile is regarded as "non new" in the next login. This is used in
 // PRE_XXX cases so that in the main XXX case we can test non new profiles.
 void PrepareNonNewProfile(const AccountId& account_id) {
   session_manager::SessionManager::Get()->CreateSession(
       account_id, account_id.GetUserEmail());
   // To prepare a non-new profile for tests, we must ensure the profile
   // directory and the preference files are created, because that's what
   // Profile::IsNewProfile() checks. CreateSession(), however, does not yet
-  // create the profile directory until GetActiveUserProfile() is called.
-  ProfileManager::GetActiveUserProfile();
+  // create the profile directory until GetProfileByUserIdHashForTest() is
+  // called.
+  ProfileHelper::Get()->GetProfileByUserIdHashForTest(
+      account_id.GetUserEmail());
+}
+
+// Simulates how UserSessionManager starts a user session by loading user
+// profile and mark session as started.
+void StartUserSession(const AccountId& account_id) {
+  ProfileHelper::GetProfileByUserIdHashForTest(
+      user_manager::UserManager::Get()->FindUser(account_id)->username_hash());
+
+  session_manager::SessionManager::Get()->SessionStarted();
 }
 
 }  // namespace
 
 class MockMagnificationObserver {
  public:
   MockMagnificationObserver() : observed_(false),
                                 observed_enabled_(false),
                                 magnifier_type_(-1)
   {
@@ skipping 70 matching lines @@
   SetMagnifierEnabled(false);
   EXPECT_FALSE(IsMagnifierEnabled());
 
   // Logs in with existing profile.
   session_manager::SessionManager::Get()->CreateSession(test_account_id_,
                                                         kTestUserName);
 
   // Confirms that magnifier is still disabled just after login.
   EXPECT_FALSE(IsMagnifierEnabled());
 
-  session_manager::SessionManager::Get()->SessionStarted();
+  StartUserSession(test_account_id_);
 
   // Confirms that magnifier is still disabled just after session starts.
   EXPECT_FALSE(IsMagnifierEnabled());
 
   // Enables magnifier.
   SetMagnifierEnabled(true);
   // Confirms that magnifier is enabled.
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ash::MAGNIFIER_FULL, GetMagnifierType());
   EXPECT_TRUE(GetScreenMagnifierEnabledFromPref());
@@ skipping 20 matching lines @@
   EXPECT_EQ(2.5, GetFullScreenMagnifierScale());
 
   // Logs in (but the session is not started yet).
   session_manager::SessionManager::Get()->CreateSession(test_account_id_,
                                                         kTestUserName);
 
   // Confirms that magnifier is keeping enabled.
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ash::MAGNIFIER_FULL, GetMagnifierType());
 
-  session_manager::SessionManager::Get()->SessionStarted();
+  StartUserSession(test_account_id_);
 
   // Confirms that magnifier is disabled just after session start.
   EXPECT_FALSE(IsMagnifierEnabled());
   EXPECT_FALSE(GetScreenMagnifierEnabledFromPref());
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, PRE_LoginOffToFull) {
   // Create a new profile once, to run the test with non-new profile.
   PrepareNonNewProfile(test_account_id_);
 
   // Sets prefs to explicitly enable the magnifier.
   SetScreenMagnifierEnabledPref(true);
   SetScreenMagnifierTypePref(ash::MAGNIFIER_FULL);
   SetFullScreenMagnifierScalePref(2.5);
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, LoginOffToFull) {
   // Disables magnifier on login screen.
   SetMagnifierEnabled(false);
   EXPECT_FALSE(IsMagnifierEnabled());
 
   // Logs in (but the session is not started yet).
   session_manager::SessionManager::Get()->CreateSession(test_account_id_,
                                                         kTestUserName);
 
   // Confirms that magnifier is keeping disabled.
   EXPECT_FALSE(IsMagnifierEnabled());
 
-  session_manager::SessionManager::Get()->SessionStarted();
+  StartUserSession(test_account_id_);
 
   // Confirms that the magnifier is enabled and configured according to the
   // explicitly set prefs just after session start.
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ash::MAGNIFIER_FULL, GetMagnifierType());
   EXPECT_EQ(2.5, GetFullScreenMagnifierScale());
   EXPECT_TRUE(GetScreenMagnifierEnabledFromPref());
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, PRE_LoginFullToFull) {
@@ skipping 16 matching lines @@
   EXPECT_EQ(3.0, GetFullScreenMagnifierScale());
 
   // Logs in (but the session is not started yet).
   session_manager::SessionManager::Get()->CreateSession(test_account_id_,
                                                         kTestUserName);
 
   // Confirms that magnifier is keeping enabled.
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ash::MAGNIFIER_FULL, GetMagnifierType());
 
-  session_manager::SessionManager::Get()->SessionStarted();
+  StartUserSession(test_account_id_);
 
   // Confirms that the magnifier is enabled and configured according to the
   // explicitly set prefs just after session start.
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ash::MAGNIFIER_FULL, GetMagnifierType());
   EXPECT_EQ(2.5, GetFullScreenMagnifierScale());
   EXPECT_TRUE(GetScreenMagnifierEnabledFromPref());
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, PRE_LoginFullToUnset) {
   // Creates a new profile once, to run the test with non-new profile.
   PrepareNonNewProfile(test_account_id_);
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, LoginFullToUnset) {
   // Enables full screen magnifier.
   SetMagnifierType(ash::MAGNIFIER_FULL);
   SetMagnifierEnabled(true);
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ash::MAGNIFIER_FULL, GetMagnifierType());
 
   // Logs in (but the session is not started yet).
   session_manager::SessionManager::Get()->CreateSession(test_account_id_,
                                                         kTestUserName);
 
   // Confirms that magnifier is keeping enabled.
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ash::MAGNIFIER_FULL, GetMagnifierType());
 
-  session_manager::SessionManager::Get()->SessionStarted();
+  StartUserSession(test_account_id_);
 
   // Confirms that magnifier is disabled.
   EXPECT_FALSE(IsMagnifierEnabled());
   EXPECT_FALSE(GetScreenMagnifierEnabledFromPref());
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, LoginAsNewUserOff) {
   // Confirms that magnifier is disabled on the login screen.
   EXPECT_FALSE(IsMagnifierEnabled());
 
   // Disables magnifier on login screen explicitly.
   SetMagnifierEnabled(false);
 
   // Logs in (but the session is not started yet).
   session_manager::SessionManager::Get()->CreateSession(test_account_id_,
                                                         kTestUserName);
 
   // Confirms that magnifier is keeping disabled.
   EXPECT_FALSE(IsMagnifierEnabled());
 
-  session_manager::SessionManager::Get()->SessionStarted();
+  StartUserSession(test_account_id_);
 
   // Confirms that magnifier is keeping disabled.
   EXPECT_FALSE(IsMagnifierEnabled());
   EXPECT_FALSE(GetScreenMagnifierEnabledFromPref());
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, LoginAsNewUserFull) {
   // Enables magnifier on login screen.
   SetMagnifierType(ash::MAGNIFIER_FULL);
   SetMagnifierEnabled(true);
   SetFullScreenMagnifierScale(2.5);
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ash::MAGNIFIER_FULL, GetMagnifierType());
   EXPECT_EQ(2.5, GetFullScreenMagnifierScale());
 
   // Logs in (but the session is not started yet).
   session_manager::SessionManager::Get()->CreateSession(test_account_id_,
                                                         kTestUserName);
 
   // Confirms that magnifier is keeping enabled.
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ash::MAGNIFIER_FULL, GetMagnifierType());
 
-  session_manager::SessionManager::Get()->SessionStarted();
+  StartUserSession(test_account_id_);
 
   // Confirms that magnifier keeps enabled.
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ash::MAGNIFIER_FULL, GetMagnifierType());
   EXPECT_EQ(2.5, GetFullScreenMagnifierScale());
   EXPECT_TRUE(GetScreenMagnifierEnabledFromPref());
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, LoginAsNewUserUnset) {
   // Confirms that magnifier is disabled on the login screen.
   EXPECT_FALSE(IsMagnifierEnabled());
 
   // Logs in (but the session is not started yet).
   session_manager::SessionManager::Get()->CreateSession(test_account_id_,
                                                         kTestUserName);
 
   // Confirms that magnifier is keeping disabled.
   EXPECT_FALSE(IsMagnifierEnabled());
 
-  session_manager::SessionManager::Get()->SessionStarted();
+  StartUserSession(test_account_id_);
 
   // Confirms that magnifier is keeping disabled.
   EXPECT_FALSE(IsMagnifierEnabled());
   EXPECT_FALSE(GetScreenMagnifierEnabledFromPref());
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, ChangeMagnifierType) {
   // Enables/disables full screen magnifier.
   SetMagnifierEnabled(false);
   SetMagnifierType(ash::MAGNIFIER_FULL);
@@ skipping 47 matching lines @@
 
   SetMagnifierType(ash::MAGNIFIER_FULL);
   EXPECT_FALSE(IsMagnifierEnabled());
   EXPECT_EQ(ash::MAGNIFIER_FULL, GetMagnifierType());
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, TypePref) {
   // Logs in
   session_manager::SessionManager::Get()->CreateSession(test_account_id_,
                                                         kTestUserName);
-  session_manager::SessionManager::Get()->SessionStarted();
+  StartUserSession(test_account_id_);
 
   // Confirms that magnifier is disabled just after login.
   EXPECT_FALSE(IsMagnifierEnabled());
 
   // Sets the pref as true to enable magnifier.
   SetScreenMagnifierTypePref(ash::MAGNIFIER_FULL);
   SetScreenMagnifierEnabledPref(true);
   // Confirms that magnifier is enabled.
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ash::MAGNIFIER_FULL, GetMagnifierType());
@@ skipping 69 matching lines @@
   observer.reset();
 
   // Set full screen magnifier again, and confirm the observer is not called.
   SetMagnifierType(ash::MAGNIFIER_FULL);
   EXPECT_FALSE(observer.observed());
   EXPECT_EQ(GetMagnifierType(), ash::MAGNIFIER_FULL);
   observer.reset();
 }
 
 }  // namespace chromeos