Index: chrome/browser/chromeos/arc/arc_session_manager_browsertest.cc |
diff --git a/chrome/browser/chromeos/arc/arc_session_manager_browsertest.cc b/chrome/browser/chromeos/arc/arc_session_manager_browsertest.cc |
index 6b6db15483a574585bddd57dab53f6f618d9c5b8..7e2176cce4b07e302da3b6b42446d0aae12eadb0 100644 |
--- a/chrome/browser/chromeos/arc/arc_session_manager_browsertest.cc |
+++ b/chrome/browser/chromeos/arc/arc_session_manager_browsertest.cc |
@@ -177,6 +177,12 @@ class ArcSessionManagerTest : public InProcessBrowserTest { |
user_manager::UserManager::Get()); |
} |
+ void EnableArc() { |
+ PrefService* const prefs = profile()->GetPrefs(); |
+ prefs->SetBoolean(prefs::kArcEnabled, true); |
+ base::RunLoop().RunUntilIdle(); |
+ } |
+ |
void set_profile_name(const std::string& username) { |
profile_->set_profile_name(username); |
} |
@@ -196,8 +202,7 @@ class ArcSessionManagerTest : public InProcessBrowserTest { |
}; |
IN_PROC_BROWSER_TEST_F(ArcSessionManagerTest, ConsumerAccount) { |
- PrefService* const prefs = profile()->GetPrefs(); |
- prefs->SetBoolean(prefs::kArcEnabled, true); |
+ EnableArc(); |
token_service()->IssueTokenForAllPendingRequests(kUnmanagedAuthToken, |
base::Time::Max()); |
ASSERT_EQ(ArcSessionManager::State::ACTIVE, |
@@ -206,9 +211,7 @@ IN_PROC_BROWSER_TEST_F(ArcSessionManagerTest, ConsumerAccount) { |
IN_PROC_BROWSER_TEST_F(ArcSessionManagerTest, WellKnownConsumerAccount) { |
set_profile_name(kWellKnownConsumerName); |
- PrefService* const prefs = profile()->GetPrefs(); |
- |
- prefs->SetBoolean(prefs::kArcEnabled, true); |
+ EnableArc(); |
ASSERT_EQ(ArcSessionManager::State::ACTIVE, |
ArcSessionManager::Get()->state()); |
} |
@@ -218,17 +221,13 @@ IN_PROC_BROWSER_TEST_F(ArcSessionManagerTest, ManagedChromeAccount) { |
policy::ProfilePolicyConnectorFactory::GetForBrowserContext(profile()); |
connector->OverrideIsManagedForTesting(true); |
- PrefService* const pref = profile()->GetPrefs(); |
- |
- pref->SetBoolean(prefs::kArcEnabled, true); |
+ EnableArc(); |
ASSERT_EQ(ArcSessionManager::State::ACTIVE, |
ArcSessionManager::Get()->state()); |
} |
IN_PROC_BROWSER_TEST_F(ArcSessionManagerTest, ManagedAndroidAccount) { |
- PrefService* const prefs = profile()->GetPrefs(); |
- |
- prefs->SetBoolean(prefs::kArcEnabled, true); |
+ EnableArc(); |
token_service()->IssueTokenForAllPendingRequests(kManagedAuthToken, |
base::Time::Max()); |
ArcSessionManagerShutdownObserver observer; |