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..f4215a527aa6fcd6e4edd22f098611a749437e2b 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_KioskArcNotEnabled) {

[hidehiko, 2017/03/02 06:38:49]

Could you avoid to use "enable". The word "enabled" are used in multiple meaning
and we're getting rid of it at all.
Maybe KioskArcInstalled?

[elijahtaylor1, 2017/03/02 19:13:35]

Done.

+  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_KioskArcEnabled) {

[hidehiko, 2017/03/02 06:38:49]

Ditto. Maybe KioskArcAvailable?

[elijahtaylor1, 2017/03/02 19:13:35]

Done. *Supported

   base::CommandLine::ForCurrentProcess()->InitFromArgv(
-      {"", "--arc-availability=installed-only-kiosk-supported"});
+      {"", "--arc-availability=installed", "--enable-arc"});

[hidehiko, 2017/03/02 06:38:49]

This is already covered by KioskArcNotEnabled case.
Could you use "--arc-availability=officially-supported" instead?

[elijahtaylor1, 2017/03/02 19:13:35]

Done.

the above case does =installed but not --arc-enabled.  But using
=officially-supported seems better still, because that's where we're
transitioning to

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