Chrome OS: revert the device wallpaper change within a user session.

components/wallpaper/wallpaper_manager_base.cc

Index: components/wallpaper/wallpaper_manager_base.cc
diff --git a/components/wallpaper/wallpaper_manager_base.cc b/components/wallpaper/wallpaper_manager_base.cc
index e573abe22f3832563df7d23bb2fd36e0b74225a2..188580d6e89d9facb63da745d0c4f3868210c0e3 100644
--- a/components/wallpaper/wallpaper_manager_base.cc
+++ b/components/wallpaper/wallpaper_manager_base.cc
@@ -490,13 +490,7 @@ void WallpaperManagerBase::OnPolicyCleared(const std::string& policy,
   GetUserWallpaperInfo(account_id, &info);
   info.type = user_manager::User::DEFAULT;
   SetUserWallpaperInfo(account_id, info, true /* is_persistent */);
-  // If the user's policy is cleared, try to set the device wallpaper first.
-  // Note We have to modify the user wallpaper info first. Otherwise, we won't
-  // be able to override the current user policy wallpaper. The wallpaper info
-  // will be set correctly if the device wallpaper is set successfully.
-  if (!SetDeviceWallpaperIfApplicable(account_id)) {
-    SetDefaultWallpaperNow(account_id);
-  }
+  SetDefaultWallpaperNow(account_id);
 }
 
 // static