wallpaper refactoring: update |current_user_wallpaper_info_| when setting wallpaper.

Bug: 794780
Change-Id: I1696b84bb4987ab5ccf5c91525a195b110befa70
Reviewed-on: https://chromium-review.googlesource.com/829881
Commit-Queue: Xiaoqian Dai <xdai@chromium.org>
Reviewed-by: Wenzhao (Colin) Zang <wzang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#525098}

ash/wallpaper/wallpaper_controller.cc

@@ -506,6 +506,7 @@ void WallpaperController::SetCustomizedDefaultWallpaperImpl(
 
 void WallpaperController::SetWallpaperImage(const gfx::ImageSkia& image,
                                             const WallpaperInfo& info) {
+  current_user_wallpaper_info_ = info;
   wallpaper::WallpaperLayout layout = info.layout;
   VLOG(1) << "SetWallpaper: image_id="
           << wallpaper::WallpaperResizer::GetImageId(image)
@@ -516,7 +517,6 @@ void WallpaperController::SetWallpaperImage(const gfx::ImageSkia& image,
     return;
   }
 
-  current_location_ = info.location;
   // Cancel any in-flight color calculation because we have a new wallpaper.
   if (color_calculator_) {
     color_calculator_->RemoveObserver(this);
@@ -664,6 +664,9 @@ bool WallpaperController::IsBlurEnabled() const {
 void WallpaperController::SetUserWallpaperInfo(const AccountId& account_id,
                                                const WallpaperInfo& info,
                                                bool is_persistent) {
+  // TODO(xdai): Remove this line after wallpaper refactoring is done.
+  // |current_user_wallpaper_info_| will be later updated in SetWallpaperImage()
+  // so theoretically it should be safe to remove the udpate here.
   current_user_wallpaper_info_ = info;
   if (!is_persistent)
     return;
@@ -906,8 +909,8 @@ void WallpaperController::OnColorCalculationComplete() {
   color_calculator_.reset();
   // TODO(crbug.com/787134): The prominent colors of wallpapers with empty
   // location should be cached as well.
-  if (!current_location_.empty())
-    CacheProminentColors(colors, current_location_);
+  if (!current_user_wallpaper_info_.location.empty())
+    CacheProminentColors(colors, current_user_wallpaper_info_.location);
   SetProminentColors(colors);
 }
 
@@ -1117,9 +1120,9 @@ void WallpaperController::CalculateWallpaperColors() {
     color_calculator_.reset();
   }
 
-  if (!current_location_.empty()) {
+  if (!current_user_wallpaper_info_.location.empty()) {
     base::Optional<std::vector<SkColor>> cached_colors =
-        GetCachedColors(current_location_);
+        GetCachedColors(current_user_wallpaper_info_.location);
     if (cached_colors.has_value()) {
       SetProminentColors(cached_colors.value());
       return;

ash/wallpaper/wallpaper_controller.h

@@ -460,7 +460,9 @@ class ASH_EXPORT WallpaperController
   // Caches the color profiles that need to do wallpaper color extracting.
   const std::vector<color_utils::ColorProfile> color_profiles_;
 
-  // Cached logged-in user wallpaper info.
+  // Cached current user wallpaper info. Note its location is used as a key for
+  // storing |prominent_colors_| in the wallpaper::kWallpaperColors pref. An
+  // empty string disables color caching.
   wallpaper::WallpaperInfo current_user_wallpaper_info_;
 
   // Cached wallpapers of users.
@@ -473,11 +475,6 @@ class ASH_EXPORT WallpaperController
   base::FilePath customized_default_wallpaper_small_;
   base::FilePath customized_default_wallpaper_large_;
 
-  // Location (see WallpaperInfo::location) used by the current wallpaper.
-  // Used as a key for storing |prominent_colors_| in the
-  // wallpaper::kWallpaperColors pref. An empty string disables color caching.
-  std::string current_location_;
-
   gfx::Size current_max_display_size_;
 
   base::OneShotTimer timer_;

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

@@ -790,7 +790,6 @@ void WallpaperManager::ShowUserWallpaper(const AccountId& account_id) {
   }
 
   gfx::ImageSkia user_wallpaper;
-  *GetCachedWallpaperInfo() = info;
   if (GetWallpaperFromCache(account_id, &user_wallpaper)) {
     GetPendingWallpaper()->SetWallpaperFromImage(account_id, user_wallpaper,
                                                  info);

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc

@@ -489,8 +489,10 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, DevicePolicyTest) {
   // Log in a test user and set the user wallpaper policy. The user policy
   // controlled wallpaper shows up in the user session.
   LoginUser(testUsers_[0]);
-  InjectPolicy(0, kGreenImageFileName);
   RunUntilWallpaperChangeCount(3);
+
+  InjectPolicy(0, kGreenImageFileName);
+  RunUntilWallpaperChangeCount(4);
   EXPECT_EQ(kGreenImageColor, GetAverageWallpaperColor());
 
   // Set the device wallpaper policy inside the user session. That that the

chrome/test/data/extensions/api_test/wallpaper_manager/test.js

@@ -57,10 +57,14 @@ chrome.test.getConfig(function(config) {
                                                  true,
                                                  '123',
                                                  pass(function(thumbnail) {
-        chrome.wallpaperPrivate.setCustomWallpaperLayout('CENTER',
-                                                         pass(function() {
-          chrome.wallpaperPrivate.setCustomWallpaperLayout('STRETCH', pass());
-        }));
+        // The current wallpaper might have not changed when |thumbnail| data is
+        // passed back. Allow the async setWallpaper task to finish.
+        setTimeout(function() {
+          chrome.wallpaperPrivate.setCustomWallpaperLayout(
+              'CENTER', pass(function() {
+            chrome.wallpaperPrivate.setCustomWallpaperLayout('STRETCH', pass());
+          }));
+        }, 500);
       }));
     },
     function setCustomPngWallpaper() {
@@ -75,11 +79,15 @@ chrome.test.getConfig(function(config) {
                                                      true,
                                                      '123',
                                                      pass(function(thumbnail) {
-            chrome.wallpaperPrivate.setCustomWallpaperLayout('CENTER',
-                                                             pass(function() {
-              chrome.wallpaperPrivate.setCustomWallpaperLayout('STRETCH',
-                                                               pass());
-            }));
+            // The current wallpaper might have not changed when |thumbnail|
+            // data is passed back. Allow the async setWallpaper task to finish.
+            setTimeout(function() {
+              chrome.wallpaperPrivate.setCustomWallpaperLayout(
+                  'CENTER', pass(function() {
+                chrome.wallpaperPrivate.setCustomWallpaperLayout(
+                    'STRETCH', pass());
+              }));
+            }, 500);
           }));
         } else {
           chrome.test.fail('Failed to load test.png from local server.');