| 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 d2b90b3aefa6216f3903d879e10b12c5c7e2c19d..c40100dac9cbe6300b1e391778efa5a2d1157361 100644
|
| --- a/chrome/browser/ui/app_list/arc/arc_app_test.cc
|
| +++ b/chrome/browser/ui/app_list/arc/arc_app_test.cc
|
| @@ -16,6 +16,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"
|
| @@ -95,9 +96,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(
|
|
|