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 cd84f960a4e65a3bea9b8b146771b62960629c96..697de71e414cff3a22b12cf4cd12f5fa0f1efb42 100644 |
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc |
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc |
@@ -34,7 +34,6 @@ KioskModeScreensaver::~KioskModeScreensaver() { |
} |
void KioskModeScreensaver::Setup() { |
- |
// We should NOT be created if already logged in. |
CHECK(!chromeos::UserManager::Get()->user_is_logged_in()); |
@@ -96,11 +95,6 @@ void InitializeKioskModeScreensaver() { |
} |
void ShutdownKioskModeScreensaver() { |
- if (!g_kiosk_mode_screensaver) { |
- LOG(WARNING) << "Screensaver shutdown called when uninitialized."; |
- return; |
- } |
- |
delete g_kiosk_mode_screensaver; |
g_kiosk_mode_screensaver = NULL; |
} |