Revert of Remove WallpaperManager dependency on Cryptohome.

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>
 
@@ skipping 14 matching lines @@
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/chrome_paths.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
-#include "chromeos/cryptohome/system_salt_getter.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/policy/core/common/cloud/cloud_policy_validator.h"
 #include "components/policy/core/common/cloud/policy_builder.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
@@ skipping 75 matching lines @@
   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 {
  protected:
   WallpaperManagerPolicyTest()
       : LoginManagerTest(true),
         wallpaper_change_count_(0),
         fake_session_manager_client_(new FakeSessionManagerClient) {
@@ skipping 148 matching lines @@
   RegisterUser(testUsers_[0].GetUserEmail());
   RegisterUser(testUsers_[1].GetUserEmail());
   StartupUtils::MarkOobeCompleted();
 }
 
 // Verifies that the wallpaper can be set and re-set through policy and that
 // setting policy for a user that is not logged in doesn't affect the current
 // user.  Also verifies that after the policy has been cleared, the wallpaper
 // 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();
 
   // Second user: Set wallpaper policy to blue image.  This should not result in
@@ skipping 73 matching lines @@
 
   // 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());
 }
 
 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());
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, PersistOverLogout) {
   LoginUser(testUsers_[0].GetUserEmail());
 
   // Wait until wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);
   ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor());
 }
 
 }  // namespace chromeos