Make login code not depend on Ash when use_athena=1

chrome/browser/chromeos/login/chrome_restart_request.cc

Index: chrome/browser/chromeos/login/chrome_restart_request.cc
diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc
index da279f7912f50c16257c94cd1b4f32e46cb0312f..9b4ef5be99502772fa6bdd6db671fa4787b598af 100644
--- a/chrome/browser/chromeos/login/chrome_restart_request.cc
+++ b/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -6,7 +6,6 @@
 
 #include <vector>
 
-#include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ -47,6 +46,10 @@
 #include "ui/wm/core/wm_core_switches.h"
 #include "url/gurl.h"
 
+#if !defined(USE_ATHENA)
+#include "ash/ash_switches.h"
+#endif
+
 using content::BrowserThread;
 
 namespace chromeos {
@@ -163,6 +166,7 @@ std::string DeriveCommandLine(const GURL& start_url,
 #endif
     app_list::switches::kDisableSyncAppList,
     app_list::switches::kEnableSyncAppList,
+#if !defined(USE_ATHENA)
     ash::switches::kAshDefaultWallpaperLarge,
     ash::switches::kAshDefaultWallpaperSmall,
     ash::switches::kAshGuestWallpaperLarge,
@@ -170,6 +174,7 @@ std::string DeriveCommandLine(const GURL& start_url,
     ash::switches::kAshHostWindowBounds,
     ash::switches::kAshTouchHud,
     ash::switches::kAuraLegacyPowerButton,
+#endif
     // Please keep these in alphabetical order. Non-UI Compositor switches
     // here should also be added to
     // content/browser/renderer_host/render_process_host_impl.cc.