Enable ARC kiosk mode always when ARC is available

chrome/browser/chromeos/arc/arc_util_unittest.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/arc/arc_util.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 182 matching lines @@
   ScopedLogIn login(
       GetFakeUserManager(),
       AccountId::AdFromObjGuid("f04557de-5da2-40ce-ae9d-b8874d8da96e"),
       user_manager::USER_TYPE_ACTIVE_DIRECTORY);
   EXPECT_FALSE(chromeos::ProfileHelper::Get()
                    ->GetUserByProfile(profile())
                    ->HasGaiaAccount());
   EXPECT_FALSE(IsArcAllowedForProfile(profile()));
 }
 
-TEST_F(ChromeArcUtilTest, IsArcAllowedForProfile_KioskArcEnabled) {
-  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()));
-}
-
-TEST_F(ChromeArcUtilTest, IsArcAllowedForProfile_KioskArcDisabled) {
+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_FALSE(IsArcAllowedForProfile(profile()));
 }
 
-TEST_F(ChromeArcUtilTest, IsArcAllowedForProfile_KioskOnlyEnabled) {
+TEST_F(ChromeArcUtilTest, IsArcAllowedForProfile_KioskArcInstalled) {
   base::CommandLine::ForCurrentProcess()->InitFromArgv(
-      {"", "--arc-availability=installed-only-kiosk-supported"});
+      {"", "--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_TRUE(IsArcAllowedForProfile(profile()));
+}
+
+TEST_F(ChromeArcUtilTest, IsArcAllowedForProfile_KioskArcSupported) {
+  base::CommandLine::ForCurrentProcess()->InitFromArgv(
+      {"", "--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);
   EXPECT_FALSE(chromeos::ProfileHelper::Get()
                    ->GetUserByProfile(profile())
                    ->HasGaiaAccount());
   EXPECT_TRUE(IsArcAllowedForProfile(profile()));
 }
 
 TEST_F(ChromeArcUtilTest, IsArcAllowedForProfile_SupervisedUserFlow) {
   auto manager_id = AccountId::FromUserEmailGaiaId(
       profile()->GetProfileUserName(), kTestGaiaId);
   ScopedLogIn login(GetFakeUserManager(), manager_id);
@@ skipping 82 matching lines @@
   EXPECT_TRUE(IsArcPlayStoreEnabledPreferenceManagedForProfile(profile()));
   EXPECT_FALSE(IsArcPlayStoreEnabledForProfile(profile()));
 
   // Remove managed state.
   profile()->GetTestingPrefService()->RemoveManagedPref(prefs::kArcEnabled);
   EXPECT_FALSE(IsArcPlayStoreEnabledPreferenceManagedForProfile(profile()));
 }
 
 }  // namespace util
 }  // namespace arc