Make the kiosk code not depend on Ash in Athena

chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.cc

Index: chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.cc
diff --git a/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.cc b/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.cc
index 733a8a90c97edf9007ae8964fc48072ccdce5a44..e7beb5a17f332cbb66ff6ca35f9037fabcefebd2 100644
--- a/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.cc
+++ b/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.cc
@@ -7,12 +7,15 @@
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part_chromeos.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/login_wizard.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/common/pref_names.h"
 
+#if !defined(USE_ATHENA)
+#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
+#endif
+
 namespace chromeos {
 
 LoginOobeSessionManagerDelegate::LoginOobeSessionManagerDelegate() {
@@ -25,8 +28,10 @@ void LoginOobeSessionManagerDelegate::Start() {
   // State will be defined once out-of-box/login branching is complete.
   ShowLoginWizard(std::string());
 
+#if !defined(USE_ATHENA)
   if (KioskModeSettings::Get()->IsKioskModeEnabled())
     InitializeKioskModeScreensaver();
+#endif
 
   // Reset reboot after update flag when login screen is shown.
   policy::BrowserPolicyConnectorChromeOS* connector =