| Index: ash/test/test_wallpaper_delegate.cc | 
| diff --git a/ash/test/test_user_wallpaper_delegate.cc b/ash/test/test_wallpaper_delegate.cc | 
| similarity index 61% | 
| rename from ash/test/test_user_wallpaper_delegate.cc | 
| rename to ash/test/test_wallpaper_delegate.cc | 
| index 76b9f64ae6f77086b3738d9598a2081314aeeff5..54fb7cec5ef485d0f4464bc623a0f321ccbc45c3 100644 | 
| --- a/ash/test/test_user_wallpaper_delegate.cc | 
| +++ b/ash/test/test_wallpaper_delegate.cc | 
| @@ -2,7 +2,7 @@ | 
| // Use of this source code is governed by a BSD-style license that can be | 
| // found in the LICENSE file. | 
|  | 
| -#include "ash/test/test_user_wallpaper_delegate.h" | 
| +#include "ash/test/test_wallpaper_delegate.h" | 
|  | 
| #include "ash/desktop_background/desktop_background_controller.h" | 
| #include "ash/shell.h" | 
| @@ -10,13 +10,12 @@ | 
| namespace ash { | 
| namespace test { | 
|  | 
| -TestUserWallpaperDelegate::TestUserWallpaperDelegate() | 
| -    : update_wallpaper_count_(0) {} | 
| +TestWallpaperDelegate::TestWallpaperDelegate() : update_wallpaper_count_(0) {} | 
|  | 
| -TestUserWallpaperDelegate::~TestUserWallpaperDelegate() {} | 
| +TestWallpaperDelegate::~TestWallpaperDelegate() {} | 
|  | 
| -void TestUserWallpaperDelegate::UpdateWallpaper(bool clear_cache) { | 
| -  DefaultUserWallpaperDelegate::UpdateWallpaper(clear_cache); | 
| +void TestWallpaperDelegate::UpdateWallpaper(bool clear_cache) { | 
| +  DefaultWallpaperDelegate::UpdateWallpaper(clear_cache); | 
| if (!custom_wallpaper_.isNull()) { | 
| Shell::GetInstance()->desktop_background_controller()->SetWallpaperImage( | 
| custom_wallpaper_, wallpaper::WALLPAPER_LAYOUT_STRETCH); | 
| @@ -24,7 +23,7 @@ void TestUserWallpaperDelegate::UpdateWallpaper(bool clear_cache) { | 
| update_wallpaper_count_++; | 
| } | 
|  | 
| -int TestUserWallpaperDelegate::GetUpdateWallpaperCountAndReset() { | 
| +int TestWallpaperDelegate::GetUpdateWallpaperCountAndReset() { | 
| int count = update_wallpaper_count_; | 
| update_wallpaper_count_ = 0; | 
| return count; | 
|  |