mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash.

ash/desktop_background/desktop_background_controller_unittest.cc

Index: ash/desktop_background/desktop_background_controller_unittest.cc
diff --git a/ash/desktop_background/desktop_background_controller_unittest.cc b/ash/desktop_background/desktop_background_controller_unittest.cc
index 28fe7072a5fb91b130612c91a90b0cd12a3d8a15..08e031bb8ade0bfb2d1d7b7c5533b582981173da 100644
--- a/ash/desktop_background/desktop_background_controller_unittest.cc
+++ b/ash/desktop_background/desktop_background_controller_unittest.cc
@@ -8,12 +8,13 @@
 #include <cstdlib>
 
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/wm_shell.h"
 #include "ash/desktop_background/desktop_background_view.h"
 #include "ash/desktop_background/desktop_background_widget_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/test/test_user_wallpaper_delegate.h"
+#include "ash/test/test_wallpaper_delegate.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
@@ -115,8 +116,8 @@ class DesktopBackgroundControllerTest : public test::AshTestBase {
     root_window_controller->SetWallpaperController(NULL);
     root_window_controller->SetAnimatingWallpaperController(NULL);
     controller_ = Shell::GetInstance()->desktop_background_controller();
-    wallpaper_delegate_ = static_cast<test::TestUserWallpaperDelegate*>(
-        Shell::GetInstance()->user_wallpaper_delegate());
+    wallpaper_delegate_ = static_cast<test::TestWallpaperDelegate*>(
+        WmShell::Get()->wallpaper_delegate());
     controller_->set_wallpaper_reload_delay_for_test(0);
   }
 
@@ -188,7 +189,7 @@ class DesktopBackgroundControllerTest : public test::AshTestBase {
 
   DesktopBackgroundController* controller_;  // Not owned.
 
-  test::TestUserWallpaperDelegate* wallpaper_delegate_;
+  test::TestWallpaperDelegate* wallpaper_delegate_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundControllerTest);