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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

Issue 2737453003: Fix ArcSessionManager state machine, part 1. (Closed)
Patch Set: Rebase Created 3 years, 9 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
« no previous file with comments | « chrome/browser/chromeos/arc/arc_session_manager_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
index f7ac73d8ec8ec93c32976cca0a5dcbc512bc6238..9ab5e62aa8120bfe3acb406a98091381be10e7eb 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
@@ -3692,12 +3692,12 @@ TEST_P(ChromeLauncherControllerImplWithArcTest, ArcManaged) {
"AppList, Chrome, Play Store");
// ARC is managed and enabled, Play Store pin should be available.
- // Note: SHOWING_TERMS_OF_SERVICE here means that opt-in flow starts.
+ // Note: NEGOTIATING_TERMS_OF_SERVICE here means that opt-in flow starts.
profile()->GetTestingPrefService()->SetManagedPref(prefs::kArcEnabled,
new base::Value(true));
base::RunLoop().RunUntilIdle();
ValidateArcState(true, true,
- arc::ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
+ arc::ArcSessionManager::State::NEGOTIATING_TERMS_OF_SERVICE,
"AppList, Chrome, Play Store");
// ARC is managed and disabled, Play Store pin should not be available.
@@ -3716,7 +3716,7 @@ TEST_P(ChromeLauncherControllerImplWithArcTest, ArcManaged) {
// ARC is not managed and enabled, Play Store pin should be available.
EnablePlayStore(true);
ValidateArcState(true, false,
- arc::ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
+ arc::ArcSessionManager::State::NEGOTIATING_TERMS_OF_SERVICE,
"AppList, Chrome, Play Store");
// User disables ARC. ARC is not managed and disabled, Play Store pin should
@@ -3728,7 +3728,7 @@ TEST_P(ChromeLauncherControllerImplWithArcTest, ArcManaged) {
// Even if re-enable it again, Play Store pin does not appear automatically.
EnablePlayStore(true);
ValidateArcState(true, false,
- arc::ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
+ arc::ArcSessionManager::State::NEGOTIATING_TERMS_OF_SERVICE,
"AppList, Chrome");
}
« no previous file with comments | « chrome/browser/chromeos/arc/arc_session_manager_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698