Rename ash desktop_background to wallpaper.

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.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 <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "ash/desktop_background/desktop_background_controller.h"
-#include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/shell.h"
+#include "ash/wallpaper/wallpaper_controller.h"
+#include "ash/wallpaper/wallpaper_controller_observer.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/json/json_writer.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
@@ skipping 81 matching lines @@
     }
   }
   bitmap.unlockPixels();
   uint64_t pixel_number = bitmap.width() * bitmap.height();
   return SkColorSetARGB((a + pixel_number / 2) / pixel_number,
                         (r + pixel_number / 2) / pixel_number,
                         (g + pixel_number / 2) / pixel_number,
                         (b + pixel_number / 2) / pixel_number);
 }
 
-// Obtain background image and return its average ARGB color.
-SkColor GetAverageBackgroundColor() {
+// Obtain wallpaper image and return its average ARGB color.
+SkColor GetAverageWallpaperColor() {
   const gfx::ImageSkia image =
-      ash::Shell::GetInstance()->desktop_background_controller()->
-      GetWallpaper();
+      ash::Shell::GetInstance()->wallpaper_controller()->GetWallpaper();
 
   const gfx::ImageSkiaRep& representation = image.GetRepresentation(1.);
   if (representation.is_null()) {
     ADD_FAILURE() << "No image representation.";
     return SkColorSetARGB(0, 0, 0, 0);
   }
 
   const SkBitmap& bitmap = representation.sk_bitmap();
   return ComputeAverageColor(bitmap);
 }
 
 // Initialize system salt to calculate wallpaper file names.
 void SetSystemSalt() {
   chromeos::SystemSaltGetter::Get()->SetRawSaltForTesting(
       chromeos::SystemSaltGetter::RawSalt({1, 2, 3, 4, 5, 6, 7, 8}));
 }
 
 }  // namespace
 
-class WallpaperManagerPolicyTest
-    : public LoginManagerTest,
-      public ash::DesktopBackgroundControllerObserver {
+class WallpaperManagerPolicyTest : public LoginManagerTest,
+                                   public ash::WallpaperControllerObserver {
  protected:
   WallpaperManagerPolicyTest()
       : LoginManagerTest(true),
         wallpaper_change_count_(0),
         fake_session_manager_client_(new FakeSessionManagerClient) {
     testUsers_.push_back(
         AccountId::FromUserEmail(LoginManagerTest::kEnterpriseUser1));
     testUsers_.push_back(
         AccountId::FromUserEmail(LoginManagerTest::kEnterpriseUser2));
   }
@@ skipping 42 matching lines @@
 
     // Allow policy fetches to fail - these tests instead invoke InjectPolicy()
     // to directly inject and modify policy dynamically.
     command_line->AppendSwitch(switches::kAllowFailedPolicyFetchForTest);
 
     LoginManagerTest::SetUpCommandLine(command_line);
   }
 
   void SetUpOnMainThread() override {
     LoginManagerTest::SetUpOnMainThread();
-    ash::Shell::GetInstance()->
-        desktop_background_controller()->AddObserver(this);
+    ash::Shell::GetInstance()->wallpaper_controller()->AddObserver(this);
 
     // Set up policy signing.
     user_policy_builders_[0] = GetUserPolicyBuilder(testUsers_[0]);
     user_policy_builders_[1] = GetUserPolicyBuilder(testUsers_[1]);
   }
 
   void TearDownOnMainThread() override {
-    ash::Shell::GetInstance()->
-        desktop_background_controller()->RemoveObserver(this);
+    ash::Shell::GetInstance()->wallpaper_controller()->RemoveObserver(this);
     LoginManagerTest::TearDownOnMainThread();
   }
 
-  // ash::DesktopBackgroundControllerObserver:
+  // ash::WallpaperControllerObserver:
   void OnWallpaperDataChanged() override {
     ++wallpaper_change_count_;
     if (run_loop_)
       run_loop_->Quit();
   }
 
   // Runs the loop until wallpaper has changed at least |count| times in total.
   void RunUntilWallpaperChangeCount(int count) {
     while (wallpaper_change_count_ < count) {
       run_loop_.reset(new base::RunLoop);
@@ skipping 74 matching lines @@
 // reverts to default.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, SetResetClear) {
   SetSystemSalt();
   wallpaper::WallpaperInfo info;
   LoginUser(testUsers_[0].GetUserEmail());
   base::RunLoop().RunUntilIdle();
 
   // First user: Wait until default wallpaper has been loaded (happens
   // automatically) and store color to recognize it later.
   RunUntilWallpaperChangeCount(1);
-  const SkColor original_background_color = GetAverageBackgroundColor();
+  const SkColor original_wallpaper_color = GetAverageWallpaperColor();
 
   // Second user: Set wallpaper policy to blue image.  This should not result in
   // a wallpaper change, which is checked at the very end of this test.
   InjectPolicy(1, kBlueImageFileName);
 
   // First user: Set wallpaper policy to red image and verify average color.
   InjectPolicy(0, kRedImageFileName);
   RunUntilWallpaperChangeCount(2);
   GetUserWallpaperInfo(0, &info);
   ASSERT_EQ(user_manager::User::POLICY, info.type);
-  ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor());
+  ASSERT_EQ(kRedImageColor, GetAverageWallpaperColor());
 
   // First user: Set wallpaper policy to green image and verify average color.
   InjectPolicy(0, kGreenImageFileName);
   RunUntilWallpaperChangeCount(3);
   GetUserWallpaperInfo(0, &info);
   ASSERT_EQ(user_manager::User::POLICY, info.type);
-  ASSERT_EQ(kGreenImageColor, GetAverageBackgroundColor());
+  ASSERT_EQ(kGreenImageColor, GetAverageWallpaperColor());
 
   // First user: Clear wallpaper policy and verify that the default wallpaper is
   // set again.
   InjectPolicy(0, "");
   RunUntilWallpaperChangeCount(4);
   GetUserWallpaperInfo(0, &info);
   ASSERT_EQ(user_manager::User::DEFAULT, info.type);
-  ASSERT_EQ(original_background_color, GetAverageBackgroundColor());
+  ASSERT_EQ(original_wallpaper_color, GetAverageWallpaperColor());
 
   // Check wallpaper change count to ensure that setting the second user's
   // wallpaper didn't have any effect.
   ASSERT_EQ(4, wallpaper_change_count_);
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest,
                        DISABLED_PRE_PRE_PRE_WallpaperOnLoginScreen) {
   RegisterUser(testUsers_[0].GetUserEmail());
   RegisterUser(testUsers_[1].GetUserEmail());
   StartupUtils::MarkOobeCompleted();
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest,
                        DISABLED_PRE_PRE_WallpaperOnLoginScreen) {
   LoginUser(testUsers_[0].GetUserEmail());
 
   // Wait until default wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);
 
   // Set wallpaper policy to red image.
   InjectPolicy(0, kRedImageFileName);
 
   // Run until wallpaper has changed.
   RunUntilWallpaperChangeCount(2);
-  ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor());
+  ASSERT_EQ(kRedImageColor, GetAverageWallpaperColor());
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest,
                        DISABLED_PRE_WallpaperOnLoginScreen) {
   LoginUser(testUsers_[1].GetUserEmail());
 
   // Wait until default wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);
 
   // Set wallpaper policy to green image.
   InjectPolicy(1, kGreenImageFileName);
 
   // Run until wallpaper has changed.
   RunUntilWallpaperChangeCount(2);
-  ASSERT_EQ(kGreenImageColor, GetAverageBackgroundColor());
+  ASSERT_EQ(kGreenImageColor, GetAverageWallpaperColor());
 }
 
 // Disabled due to flakiness: http://crbug.com/385648.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest,
                        DISABLED_WallpaperOnLoginScreen) {
   // Wait for active pod's wallpaper to be loaded.
   RunUntilWallpaperChangeCount(1);
-  ASSERT_EQ(kGreenImageColor, GetAverageBackgroundColor());
+  ASSERT_EQ(kGreenImageColor, GetAverageWallpaperColor());
 
   // Select the second pod (belonging to user 1).
   ASSERT_TRUE(content::ExecuteScript(
       LoginDisplayHost::default_host()->GetOobeUI()->web_ui()->GetWebContents(),
       "document.getElementsByClassName('pod')[1].focus();"));
   RunUntilWallpaperChangeCount(2);
-  ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor());
+  ASSERT_EQ(kRedImageColor, GetAverageWallpaperColor());
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, PRE_PRE_PersistOverLogout) {
   SetSystemSalt();
   RegisterUser(testUsers_[0].GetUserEmail());
   StartupUtils::MarkOobeCompleted();
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, PRE_PersistOverLogout) {
   SetSystemSalt();
   LoginUser(testUsers_[0].GetUserEmail());
 
   // Wait until default wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);
 
   // Set wallpaper policy to red image.
   InjectPolicy(0, kRedImageFileName);
 
   // Run until wallpaper has changed.
   RunUntilWallpaperChangeCount(2);
-  ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor());
+  ASSERT_EQ(kRedImageColor, GetAverageWallpaperColor());
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, PersistOverLogout) {
   LoginUser(testUsers_[0].GetUserEmail());
 
   // Wait until wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);
-  ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor());
+  ASSERT_EQ(kRedImageColor, GetAverageWallpaperColor());
 }
 
 }  // namespace chromeos