| Index: chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| index e6287baa7a75d6dd9fa6d73a02fbd6950b0d7c47..fff19616da6c640dc3ff991e67a36cba4ae48a8d 100644
|
| --- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| @@ -394,8 +394,7 @@ class LoginUtilsBlockingLoginTest
|
|
|
| TEST_F(LoginUtilsTest, NormalLoginDoesntBlock) {
|
| UserManager* user_manager = UserManager::Get();
|
| - ASSERT_TRUE(!user_manager->IsUserLoggedIn() ||
|
| - user_manager->IsLoggedInAsStub());
|
| + ASSERT_TRUE(!user_manager->IsUserLoggedIn());
|
| EXPECT_FALSE(connector_->IsEnterpriseManaged());
|
| EXPECT_FALSE(prepared_profile_);
|
|
|
| @@ -403,23 +402,20 @@ TEST_F(LoginUtilsTest, NormalLoginDoesntBlock) {
|
| PrepareProfile(kUsername);
|
|
|
| EXPECT_TRUE(prepared_profile_);
|
| - ASSERT_TRUE(user_manager->IsUserLoggedIn() &&
|
| - !user_manager->IsLoggedInAsStub());
|
| + ASSERT_TRUE(user_manager->IsUserLoggedIn());
|
| EXPECT_EQ(kUsername, user_manager->GetLoggedInUser().email());
|
| }
|
|
|
| TEST_F(LoginUtilsTest, EnterpriseLoginDoesntBlockForNormalUser) {
|
| UserManager* user_manager = UserManager::Get();
|
| - ASSERT_TRUE(!user_manager->IsUserLoggedIn() ||
|
| - user_manager->IsLoggedInAsStub());
|
| + ASSERT_TRUE(!user_manager->IsUserLoggedIn());
|
| EXPECT_FALSE(connector_->IsEnterpriseManaged());
|
| EXPECT_FALSE(prepared_profile_);
|
|
|
| // Enroll the device.
|
| LockDevice(kUsername);
|
|
|
| - ASSERT_TRUE(!user_manager->IsUserLoggedIn() ||
|
| - user_manager->IsLoggedInAsStub());
|
| + ASSERT_TRUE(!user_manager->IsUserLoggedIn());
|
| EXPECT_TRUE(connector_->IsEnterpriseManaged());
|
| EXPECT_EQ(kDomain, connector_->GetEnterpriseDomain());
|
| EXPECT_FALSE(prepared_profile_);
|
| @@ -428,23 +424,20 @@ TEST_F(LoginUtilsTest, EnterpriseLoginDoesntBlockForNormalUser) {
|
| PrepareProfile(kUsernameOtherDomain);
|
|
|
| EXPECT_TRUE(prepared_profile_);
|
| - ASSERT_TRUE(user_manager->IsUserLoggedIn() &&
|
| - !user_manager->IsLoggedInAsStub());
|
| + ASSERT_TRUE(user_manager->IsUserLoggedIn());
|
| EXPECT_EQ(kUsernameOtherDomain, user_manager->GetLoggedInUser().email());
|
| }
|
|
|
| TEST_P(LoginUtilsBlockingLoginTest, EnterpriseLoginBlocksForEnterpriseUser) {
|
| UserManager* user_manager = UserManager::Get();
|
| - ASSERT_TRUE(!user_manager->IsUserLoggedIn() ||
|
| - user_manager->IsLoggedInAsStub());
|
| + ASSERT_TRUE(!user_manager->IsUserLoggedIn());
|
| EXPECT_FALSE(connector_->IsEnterpriseManaged());
|
| EXPECT_FALSE(prepared_profile_);
|
|
|
| // Enroll the device.
|
| LockDevice(kUsername);
|
|
|
| - ASSERT_TRUE(!user_manager->IsUserLoggedIn() ||
|
| - user_manager->IsLoggedInAsStub());
|
| + ASSERT_TRUE(!user_manager->IsUserLoggedIn());
|
| EXPECT_TRUE(connector_->IsEnterpriseManaged());
|
| EXPECT_EQ(kDomain, connector_->GetEnterpriseDomain());
|
| EXPECT_FALSE(prepared_profile_);
|
| @@ -453,8 +446,7 @@ TEST_P(LoginUtilsBlockingLoginTest, EnterpriseLoginBlocksForEnterpriseUser) {
|
| PrepareProfile(kUsername);
|
|
|
| EXPECT_FALSE(prepared_profile_);
|
| - ASSERT_TRUE(user_manager->IsUserLoggedIn() &&
|
| - !user_manager->IsLoggedInAsStub());
|
| + ASSERT_TRUE(user_manager->IsUserLoggedIn());
|
|
|
| GaiaUrls* gaia_urls = GaiaUrls::GetInstance();
|
| net::TestURLFetcher* fetcher;
|
|
|