Excludes settings which uses Ash from Athena.

chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

Index: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
index cc917c8ef5b6672c91b4aebfb5a7dcece7a58a4b..6ec310938293fa24072390256193a1c1548c16db 100644
--- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
@@ -241,6 +241,11 @@ void CoreChromeOSOptionsHandler::StopObservingPref(const std::string& path) {
 base::Value* CoreChromeOSOptionsHandler::CreateValueForPref(
     const std::string& pref_name,
     const std::string& controlling_pref_name) {
+  // Athena doesn't have ash::Shell and its session_state_delegate, so the
+  // following code will cause crash.
+  // TODO(mukai|antrim): re-enable this after having session_state_delegate.
+  // http://crbug.com/370175
+#if !defined(USE_ATHENA)
   // The screen lock setting is shared if multiple users are logged in and at
   // least one has chosen to require passwords.
   if (pref_name == prefs::kEnableAutoScreenLock &&
@@ -268,6 +273,7 @@ base::Value* CoreChromeOSOptionsHandler::CreateValueForPref(
       }
     }
   }
+#endif
 
   return CoreOptionsHandler::CreateValueForPref(pref_name,
                                                 controlling_pref_name);