Integrate Kiosk Mode with enterprise policies.

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 0e242151653b62d9395cf48689895cefe7af45dc..038f2af29e8284aee17f146029b1168dc737499f 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -206,7 +206,7 @@
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
-#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_helper.h"
+#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #if defined(USE_AURA)
 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"
 #endif
@@ -2506,7 +2506,7 @@ void Browser::OpenFileManager() {
 void Browser::LockScreen() {
   content::RecordAction(UserMetricsAction("LockScreen"));
   // Never lock the screen for kiosk mode.
-  if (chromeos::KioskModeHelper::IsKioskModeEnabled())
+  if (chromeos::KioskModeSettings::IsKioskModeEnabled())
     return;
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       NotifyScreenLockRequested();