Revert r207560 and r207566 to reland r207511.

chrome/browser/chromeos/login/chrome_restart_request.cc

 // Copyright 2013 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/login/chrome_restart_request.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "base/chromeos/chromeos_version.h"
@@ skipping 112 matching lines @@
       ::switches::kUIMaxFramesPending,
       ::switches::kUIPrioritizeInGpuProcess,
 #if defined(USE_CRAS)
       ::switches::kUseCras,
 #endif
       ::switches::kUseGL,
       ::switches::kUserDataDir,
       ::switches::kUseExynosVda,
       ::switches::kV,
       ::switches::kEnableWebGLDraftExtensions,
+      ash::switches::kAshDefaultGuestWallpaperLarge,
+      ash::switches::kAshDefaultGuestWallpaperSmall,
+      ash::switches::kAshDefaultWallpaperLarge,
+      ash::switches::kAshDefaultWallpaperSmall,
+      ash::switches::kAshDisableNewAudioHandler,
+      ash::switches::kAshEnableAudioDeviceMenu,
+      ash::switches::kAshHostWindowBounds,
       ash::switches::kAshTouchHud,
       ash::switches::kAuraLegacyPowerButton,
-      ash::switches::kAshDisableNewAudioHandler,
-      ash::switches::kAshEnableAudioDeviceMenu,
       // 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.
       cc::switches::kBackgroundColorInsteadOfCheckerboard,
       cc::switches::kCompositeToMailbox,
       cc::switches::kDisableColorEstimator,
       cc::switches::kDisableImplSidePainting,
       cc::switches::kDisableThreadedAnimation,
       cc::switches::kEnableImplSidePainting,
       cc::switches::kEnablePartialSwap,
@@ skipping 194 matching lines @@
     // Relaunch chrome without session manager on dev box.
     ReLaunch(command_line);
     return;
   }
 
   // ChromeRestartRequest deletes itself after request sent to session manager.
   (new ChromeRestartRequest(command_line))->Start();
 }
 
 }  // namespace chromeos