Enable ARC kiosk mode always when ARC is available

chrome/browser/chromeos/arc/arc_util_unittest.cc

Index: chrome/browser/chromeos/arc/arc_util_unittest.cc
diff --git a/chrome/browser/chromeos/arc/arc_util_unittest.cc b/chrome/browser/chromeos/arc/arc_util_unittest.cc
index ef9845b19772a30f4df9dcce131a3c46acc02b37..eb28b493fc258f7481a3a90478465cbd8419c30b 100644
--- a/chrome/browser/chromeos/arc/arc_util_unittest.cc
+++ b/chrome/browser/chromeos/arc/arc_util_unittest.cc
@@ -200,30 +200,32 @@ TEST_F(ChromeArcUtilTest, IsArcAllowedForProfile_ActiveDirectoryDisabled) {
   EXPECT_FALSE(IsArcAllowedForProfile(profile()));
 }
 
-TEST_F(ChromeArcUtilTest, IsArcAllowedForProfile_KioskArcEnabled) {
+TEST_F(ChromeArcUtilTest, IsArcAllowedForProfile_KioskArcNotAvailable) {
+  base::CommandLine::ForCurrentProcess()->InitFromArgv({""});
   ScopedLogIn login(GetFakeUserManager(),
                     AccountId::FromUserEmail(profile()->GetProfileUserName()),
                     user_manager::USER_TYPE_ARC_KIOSK_APP);
   EXPECT_FALSE(chromeos::ProfileHelper::Get()
                    ->GetUserByProfile(profile())
                    ->HasGaiaAccount());
-  EXPECT_TRUE(IsArcAllowedForProfile(profile()));
+  EXPECT_FALSE(IsArcAllowedForProfile(profile()));
 }
 
-TEST_F(ChromeArcUtilTest, IsArcAllowedForProfile_KioskArcDisabled) {
-  base::CommandLine::ForCurrentProcess()->InitFromArgv({""});
+TEST_F(ChromeArcUtilTest, IsArcAllowedForProfile_KioskArcInstalled) {
+  base::CommandLine::ForCurrentProcess()->InitFromArgv(
+      {"", "--arc-availability=installed"});
   ScopedLogIn login(GetFakeUserManager(),
                     AccountId::FromUserEmail(profile()->GetProfileUserName()),
                     user_manager::USER_TYPE_ARC_KIOSK_APP);
   EXPECT_FALSE(chromeos::ProfileHelper::Get()
                    ->GetUserByProfile(profile())
                    ->HasGaiaAccount());
-  EXPECT_FALSE(IsArcAllowedForProfile(profile()));
+  EXPECT_TRUE(IsArcAllowedForProfile(profile()));
 }
 
-TEST_F(ChromeArcUtilTest, IsArcAllowedForProfile_KioskOnlyEnabled) {
+TEST_F(ChromeArcUtilTest, IsArcAllowedForProfile_KioskArcSupported) {
   base::CommandLine::ForCurrentProcess()->InitFromArgv(
-      {"", "--arc-availability=installed-only-kiosk-supported"});
+      {"", "--arc-availability=officially-supported", "--enable-arc"});

[Luis Héctor Chávez, 2017/03/02 18:42:00]

Does this work even after leaving out the "--enable-arc" flag? We're trying to
get rid of it, and the arc-availability flag supersedes it:
https://cs.chromium.org/chromium/src/components/arc/arc_util.cc?q=arc_util.cc...

(or did you mean to use --arc-available?)

[elijahtaylor1, 2017/03/02 19:16:48]

yes, you're right I should remove --enable-arc, everything works fine (since it
does a fallback to IsArcAvailable)

   ScopedLogIn login(GetFakeUserManager(),
                     AccountId::FromUserEmail(profile()->GetProfileUserName()),
                     user_manager::USER_TYPE_ARC_KIOSK_APP);