Integrate Kiosk Mode with enterprise policies.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index f65b0814606bb3b11ef52638867a1bfd747bd56a..a870241c3d67661ad45bb0ccbe9afabc5fdde0c8 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -24,9 +24,9 @@
 #include "chrome/browser/chromeos/imageburner/burn_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
-#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_helper.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
+#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
@@ -206,7 +206,7 @@ void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line,
 
     browser::ShowLoginWizard(first_screen, size);
 
-    if (chromeos::KioskModeHelper::IsKioskModeEnabled())
+    if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled())
       chromeos::InitializeKioskModeScreensaver();
   } else if (parsed_command_line.HasSwitch(switches::kLoginUser) &&
       parsed_command_line.HasSwitch(switches::kLoginPassword)) {
@@ -231,7 +231,7 @@ ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos(
 }
 
 ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
-  if (chromeos::KioskModeHelper::IsKioskModeEnabled())
+  if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled())
     chromeos::ShutdownKioskModeScreensaver();
   cryptohome::AsyncMethodCaller::Shutdown();
   chromeos::disks::DiskMountManager::Shutdown();
@@ -366,7 +366,7 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
 
   // Initialize the screen locker now so that it can receive
   // LOGIN_USER_CHANGED notification from UserManager.
-  if (chromeos::KioskModeHelper::IsKioskModeEnabled()) {
+  if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) {
     chromeos::InitializeKioskModeIdleLogout();
   } else {
     chromeos::ScreenLocker::InitClass();