Integrate Kiosk Mode with enterprise policies.

chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
 
 #include "base/bind.h"
 #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"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 
 namespace chromeos {
 
 KioskModeScreensaver::KioskModeScreensaver() {
-  if (chromeos::KioskModeHelper::Get()->is_initialized())
+  chromeos::KioskModeSettings* kiosk_mode_settings =
+      chromeos::KioskModeSettings::Get();
+
+  if (kiosk_mode_settings->is_initialized()) {
     Setup();
-  else
-    chromeos::KioskModeHelper::Get()->Initialize(
-        base::Bind(&KioskModeScreensaver::Setup,
-                   base::Unretained(this)));
-
+  } else {
+    kiosk_mode_settings->Initialize(base::Bind(&KioskModeScreensaver::Setup,
+                                               base::Unretained(this)));
+  }
 }
 
 KioskModeScreensaver::~KioskModeScreensaver() {
   chromeos::PowerManagerClient* power_manager =
       chromeos::DBusThreadManager::Get()->GetPowerManagerClient();
   if (power_manager->HasObserver(this))
     power_manager->RemoveObserver(this);
 }
 
 void KioskModeScreensaver::Setup() {
@@ skipping 56 matching lines @@
 
   g_kiosk_mode_screensaver = new KioskModeScreensaver();
 }
 
 void ShutdownKioskModeScreensaver() {
   delete g_kiosk_mode_screensaver;
   g_kiosk_mode_screensaver = NULL;
 }
 
 }  // namespace chromeos