Integrate Kiosk Mode with enterprise policies.

chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

Index: chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
index 8f1febbc6cbf5d667e2b61f4fb33e592a45dc676..84a781c1a83633990499ee422aea92447ff16ae8 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
@@ -8,7 +8,7 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_helper.h"
+#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/ui/screensaver_extension_dialog.h"
@@ -18,13 +18,15 @@
 namespace chromeos {
 
 KioskModeScreensaver::KioskModeScreensaver() {
-  if (chromeos::KioskModeHelper::Get()->is_initialized())
-    Setup();
-  else
-    chromeos::KioskModeHelper::Get()->Initialize(
-        base::Bind(&KioskModeScreensaver::Setup,
-                   base::Unretained(this)));
+  chromeos::KioskModeSettings* kiosk_mode_helper =

[Mattias Nissler (ping if slow), 2012/03/20 13:10:35]

variable name should probably change to reflect helper -> settings

[rkc, 2012/03/20 21:00:42]

Done.

+      chromeos::KioskModeSettings::Get();
 
+  if (kiosk_mode_helper->is_initialized()) {
+    Setup();
+  } else {
+    kiosk_mode_helper->Initialize(base::Bind(&KioskModeScreensaver::Setup,
+                                             base::Unretained(this)));
+  }
 }
 
 KioskModeScreensaver::~KioskModeScreensaver() {