Enable ARC kiosk mode always when ARC is available

components/arc/arc_util_unittest.cc

Index: components/arc/arc_util_unittest.cc
diff --git a/components/arc/arc_util_unittest.cc b/components/arc/arc_util_unittest.cc
index dd803cbbda1a6ef10c54a54a1c8a9e3f93846f01..a39c92bbc15000dd76a49158bd464bbb1174fa52 100644
--- a/components/arc/arc_util_unittest.cc
+++ b/components/arc/arc_util_unittest.cc
@@ -80,7 +80,9 @@ TEST_F(ArcUtilTest, IsArcAvailable_Installed) {
 
   // Not available, by-default, too.
   EXPECT_FALSE(IsArcAvailable());
-  EXPECT_FALSE(IsArcKioskAvailable());
+
+  // ARC is available in kiosk mode if installed.
+  EXPECT_TRUE(IsArcKioskAvailable());
 
   {
     ScopedArcFeature feature(true);
@@ -90,7 +92,7 @@ TEST_F(ArcUtilTest, IsArcAvailable_Installed) {
   {
     ScopedArcFeature feature(false);
     EXPECT_FALSE(IsArcAvailable());
-    EXPECT_FALSE(IsArcKioskAvailable());
+    EXPECT_TRUE(IsArcKioskAvailable());
   }
 
   // If ARC is installed, IsArcAvailable() should return true when EnableARC
@@ -99,7 +101,9 @@ TEST_F(ArcUtilTest, IsArcAvailable_Installed) {
 
   // Not available, by-default, too.
   EXPECT_FALSE(IsArcAvailable());
-  EXPECT_FALSE(IsArcKioskAvailable());
+
+  // ARC is available in kiosk mode if installed.
+  EXPECT_TRUE(IsArcKioskAvailable());
 
   {
     ScopedArcFeature feature(true);
@@ -109,23 +113,10 @@ TEST_F(ArcUtilTest, IsArcAvailable_Installed) {
   {
     ScopedArcFeature feature(false);
     EXPECT_FALSE(IsArcAvailable());
-    EXPECT_FALSE(IsArcKioskAvailable());
+    EXPECT_TRUE(IsArcKioskAvailable());
   }
 }
 
-TEST_F(ArcUtilTest, IsArcAvailable_OnlyKioskSupported) {
-  // Regardless of FeatureList, IsArcAvailable() should return true.
-  auto* command_line = base::CommandLine::ForCurrentProcess();
-  command_line->InitFromArgv({"", "--enable-arc"});
-  EXPECT_TRUE(IsArcAvailable());
-  EXPECT_TRUE(IsArcKioskAvailable());
-
-  command_line->InitFromArgv(
-      {"", "--arc-availability=installed-only-kiosk-supported"});
-  EXPECT_FALSE(IsArcAvailable());
-  EXPECT_TRUE(IsArcKioskAvailable());
-}
-
 TEST_F(ArcUtilTest, IsArcAvailable_OfficiallySupported) {
   // Regardless of FeatureList, IsArcAvailable() should return true.
   auto* command_line = base::CommandLine::ForCurrentProcess();