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

Unified Diff: chrome/browser/ui/app_list/arc/arc_app_test.cc

Issue 2707133006: Start ARC and sign in after Chrome OS login (Closed)
Patch Set: rebase to ToT 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
Index: chrome/browser/ui/app_list/arc/arc_app_test.cc
diff --git a/chrome/browser/ui/app_list/arc/arc_app_test.cc b/chrome/browser/ui/app_list/arc/arc_app_test.cc
index a529b2fb59fabe5b89ad35521622a74254b7f56b..94ad8c212e71cd38e092189eb1a0664089270df4 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_test.cc
+++ b/chrome/browser/ui/app_list/arc/arc_app_test.cc
@@ -101,9 +101,14 @@ void ArcAppTest::SetUp(Profile* profile) {
arc_app_list_pref_->SetDefaltAppsReadyCallback(run_loop.QuitClosure());
run_loop.Run();
- arc::SetArcPlayStoreEnabledForProfile(profile_, true);
// Check initial conditions.
- EXPECT_FALSE(arc_session_manager_->IsSessionRunning());
+ if (arc::ShouldArcAlwaysStart()) {
+ // When ARC first starts, it runs in opt-out mode of Play Store.
+ EXPECT_TRUE(arc_session_manager_->IsSessionRunning());
+ } else {
+ arc::SetArcPlayStoreEnabledForProfile(profile_, true);
+ EXPECT_FALSE(arc_session_manager_->IsSessionRunning());
+ }
app_instance_.reset(new arc::FakeAppInstance(arc_app_list_pref_));
arc_service_manager_->arc_bridge_service()->app()->SetInstance(
« no previous file with comments | « chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698