[M57] Enable ARC kiosk mode always when ARC is available

components/arc/arc_bridge_service.cc

 // Copyright 2015 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_bridge_service.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 17 matching lines @@
 
 // static
 bool ArcBridgeService::GetEnabled(const base::CommandLine* command_line) {
   return command_line->HasSwitch(chromeos::switches::kEnableArc) ||
          (command_line->HasSwitch(chromeos::switches::kArcAvailable) &&
           base::FeatureList::IsEnabled(kArcEnabledFeature));
 }
 
 bool ArcBridgeService::GetKioskEnabled(const base::CommandLine* command_line) {
   return GetEnabled(command_line) ||
-         command_line->HasSwitch(chromeos::switches::kEnableArcKiosk);
+         command_line->HasSwitch(chromeos::switches::kArcAvailable);
 }
 
 bool ArcBridgeService::GetKioskStarted(const base::CommandLine* command_line) {
   return user_manager::UserManager::IsInitialized() &&
          user_manager::UserManager::Get()->IsLoggedInAsArcKioskApp() &&
          GetKioskEnabled(command_line);
 }
 
 // static
 bool ArcBridgeService::GetAvailable(const base::CommandLine* command_line) {
   return command_line->HasSwitch(chromeos::switches::kArcAvailable);
 }
 
 }  // namespace arc