[Merge to M58]Chrome OS: revert the device wallpaper change within a user session.

components/wallpaper/wallpaper_manager_base.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/wallpaper/wallpaper_manager_base.h"
 
 #include <numeric>
 #include <vector>
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 456 matching lines @@
   info.type = user_manager::User::POLICY;
   SetUserWallpaperInfo(account_id, info, true /* is_persistent */);
 }
 
 void WallpaperManagerBase::OnPolicyCleared(const std::string& policy,
                                            const AccountId& account_id) {
   WallpaperInfo info;
   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
 base::FilePath WallpaperManagerBase::GetCustomWallpaperPath(
     const char* sub_dir,
     const wallpaper::WallpaperFilesId& wallpaper_files_id,
     const std::string& file) {
   base::FilePath custom_wallpaper_path = GetCustomWallpaperDir(sub_dir);
   return custom_wallpaper_path.Append(wallpaper_files_id.id()).Append(file);
 }
@@ skipping 551 matching lines @@
 void WallpaperManagerBase::CreateSolidDefaultWallpaper() {
   loaded_wallpapers_for_test_++;
   SkBitmap bitmap;
   bitmap.allocN32Pixels(1, 1);
   bitmap.eraseColor(kDefaultWallpaperColor);
   const gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
   default_wallpaper_image_.reset(new user_manager::UserImage(image));
 }
 
 }  // namespace wallpaper