| Index: ash/test/test_shell_delegate.cc
|
| diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
|
| index 1de799c9711a5f6d74c798721c5367f80f8ba51a..3c6543c111554eaa5826b97580b89d7882e46cbd 100644
|
| --- a/ash/test/test_shell_delegate.cc
|
| +++ b/ash/test/test_shell_delegate.cc
|
| @@ -21,7 +21,7 @@
|
| #include "ash/test/test_session_state_delegate.h"
|
| #include "ash/test/test_shelf_delegate.h"
|
| #include "ash/test/test_system_tray_delegate.h"
|
| -#include "ash/test/test_user_wallpaper_delegate.h"
|
| +#include "ash/test/test_wallpaper_delegate.h"
|
| #include "ash/wm/window_util.h"
|
| #include "base/logging.h"
|
| #include "base/memory/ptr_util.h"
|
| @@ -166,8 +166,9 @@ SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate() {
|
| return new TestSystemTrayDelegate;
|
| }
|
|
|
| -UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() {
|
| - return new TestUserWallpaperDelegate();
|
| +std::unique_ptr<WallpaperDelegate>
|
| +TestShellDelegate::CreateWallpaperDelegate() {
|
| + return base::MakeUnique<TestWallpaperDelegate>();
|
| }
|
|
|
| TestSessionStateDelegate* TestShellDelegate::CreateSessionStateDelegate() {
|
|
|