Enable ARC kiosk mode always when ARC is available

components/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 "components/arc/arc_util.h"
 
 #include <memory>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 62 matching lines @@
     EXPECT_FALSE(IsArcAvailable());
     EXPECT_FALSE(IsArcKioskAvailable());
   }
 
   // If ARC is installed, IsArcAvailable() should return true when EnableARC
   // feature is set.
   command_line->InitFromArgv({"", "--arc-available"});
 
   // 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);
     EXPECT_TRUE(IsArcAvailable());
     EXPECT_TRUE(IsArcKioskAvailable());
   }
   {
     ScopedArcFeature feature(false);
     EXPECT_FALSE(IsArcAvailable());
-    EXPECT_FALSE(IsArcKioskAvailable());
+    EXPECT_TRUE(IsArcKioskAvailable());
   }
 
   // If ARC is installed, IsArcAvailable() should return true when EnableARC
   // feature is set.
   command_line->InitFromArgv({"", "--arc-availability=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);
     EXPECT_TRUE(IsArcAvailable());
     EXPECT_TRUE(IsArcKioskAvailable());
   }
   {
     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();
   command_line->InitFromArgv({"", "--enable-arc"});
   EXPECT_TRUE(IsArcAvailable());
   EXPECT_TRUE(IsArcKioskAvailable());
 
   command_line->InitFromArgv({"", "--arc-availability=officially-supported"});
   EXPECT_TRUE(IsArcAvailable());
   EXPECT_TRUE(IsArcKioskAvailable());
@@ skipping 28 matching lines @@
   auto* command_line = base::CommandLine::ForCurrentProcess();
   command_line->InitFromArgv({""});
   EXPECT_FALSE(IsArcOptInVerificationDisabled());
 
   command_line->InitFromArgv({"", "--disable-arc-opt-in-verification"});
   EXPECT_TRUE(IsArcOptInVerificationDisabled());
 }
 
 }  // namespace
 }  // namespace arc