arc: Stop/start ARC++ kiosk app when maintenance session started/finished.

chrome/browser/chromeos/arc/arc_service_launcher.cc

Index: chrome/browser/chromeos/arc/arc_service_launcher.cc
diff --git a/chrome/browser/chromeos/arc/arc_service_launcher.cc b/chrome/browser/chromeos/arc/arc_service_launcher.cc
index 02c4d295b25a89f1eec654f7e0dd81a6821fa0c2..0f3b1de0774286a88573d38cde81406e8f708938 100644
--- a/chrome/browser/chromeos/arc/arc_service_launcher.cc
+++ b/chrome/browser/chromeos/arc/arc_service_launcher.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
+#include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.h"
 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_service.h"
@@ -36,6 +37,7 @@
 #include "components/arc/storage_manager/arc_storage_manager.h"
 #include "components/arc/user_data/arc_user_data_service.h"
 #include "components/prefs/pref_member.h"
+#include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/arc/notification/arc_notification_manager.h"
 
@@ -103,8 +105,6 @@ void ArcServiceLauncher::Initialize() {
   arc_service_manager_->AddService(
       base::MakeUnique<ArcImeService>(arc_bridge_service));
   arc_service_manager_->AddService(
-      base::MakeUnique<ArcKioskBridge>(arc_bridge_service));
-  arc_service_manager_->AddService(
       base::MakeUnique<ArcMetricsService>(arc_bridge_service));
   arc_service_manager_->AddService(
       base::MakeUnique<ArcNetHostImpl>(arc_bridge_service));
@@ -135,6 +135,14 @@ void ArcServiceLauncher::OnPrimaryUserProfilePrepared(Profile* profile) {
   arc_service_manager_->AddService(base::MakeUnique<ArcNotificationManager>(
       arc_service_manager_->arc_bridge_service(),
       multi_user_util::GetAccountIdFromProfile(profile)));
+
+  // Kiosk apps should be run only for kiosk sessions.
+  if (user_manager::UserManager::Get()->IsLoggedInAsArcKioskApp()) {
+    arc_service_manager_->AddService(base::MakeUnique<ArcKioskBridge>(
+        arc_service_manager_->arc_bridge_service(),
+        chromeos::ArcKioskAppService::Get(profile)));
+  }
+
   arc_session_manager_->OnPrimaryUserProfilePrepared(profile);
 }