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 782f0075f4e84b9420735e66d3c2c489ded72668..878e5ded345e9840b57c0b0145d0e329aeec5b00 100644 |
--- a/chrome/browser/ui/app_list/arc/arc_app_test.cc |
+++ b/chrome/browser/ui/app_list/arc/arc_app_test.cc |
@@ -15,6 +15,7 @@ |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" |
#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs_factory.h" |
+#include "chromeos/chromeos_switches.h" |
#include "chromeos/dbus/dbus_thread_manager.h" |
#include "components/arc/arc_bridge_service.h" |
#include "components/arc/arc_service_manager.h" |
@@ -93,9 +94,14 @@ void ArcAppTest::SetUp(Profile* profile) { |
arc_app_list_pref_->SetDefaltAppsReadyCallback(run_loop.QuitClosure()); |
run_loop.Run(); |
- arc_session_manager_->SetArcPlayStoreEnabled(true); |
// Check initial conditions. |
- EXPECT_FALSE(arc_session_manager_->IsSessionRunning()); |
+ if (arc::ShouldAlwaysStartArc()) { |
+ // When ARC first starts, it runs in opt-out mode of Play Store. |
+ EXPECT_TRUE(arc_session_manager_->IsSessionRunning()); |
+ } else { |
+ arc_session_manager_->SetArcPlayStoreEnabled(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( |