Promotes a handful of members from WmShell to Shell

ash/test/test_wallpaper_delegate.cc

Index: ash/test/test_wallpaper_delegate.cc
diff --git a/ash/test/test_wallpaper_delegate.cc b/ash/test/test_wallpaper_delegate.cc
index 16279be13a161ccf25580533c8d275b0ef423631..1296314e93e480005fcd38cd7a3b5681ae014759 100644
--- a/ash/test/test_wallpaper_delegate.cc
+++ b/ash/test/test_wallpaper_delegate.cc
@@ -5,7 +5,7 @@
 #include "ash/test/test_wallpaper_delegate.h"
 
 #include "ash/common/wallpaper/wallpaper_controller.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
 
 namespace ash {
 namespace test {
@@ -17,7 +17,7 @@ TestWallpaperDelegate::~TestWallpaperDelegate() {}
 void TestWallpaperDelegate::UpdateWallpaper(bool clear_cache) {
   DefaultWallpaperDelegate::UpdateWallpaper(clear_cache);
   if (!custom_wallpaper_.isNull()) {
-    WmShell::Get()->wallpaper_controller()->SetWallpaperImage(
+    Shell::GetInstance()->wallpaper_controller()->SetWallpaperImage(
         custom_wallpaper_, wallpaper::WALLPAPER_LAYOUT_STRETCH);
   }
   update_wallpaper_count_++;