Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2879)

Unified Diff: ash/desktop_background/desktop_background_controller_unittest.cc

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..28583c7f9d32a0443936f67f5a3486606795b53e 100644
--- a/ash/desktop_background/desktop_background_controller_unittest.cc
+++ b/ash/desktop_background/desktop_background_controller_unittest.cc
@@ -13,7 +13,7 @@
#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 +115,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 +188,7 @@ class DesktopBackgroundControllerTest : public test::AshTestBase {
DesktopBackgroundController* controller_; // Not owned.
- test::TestUserWallpaperDelegate* wallpaper_delegate_;
+ test::TestWallpaperDelegate* wallpaper_delegate_;
private:
DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundControllerTest);

Powered by Google App Engine
This is Rietveld 408576698