Revert of Remove WallpaperManager dependency on Cryptohome.

chromeos/cryptohome/system_salt_getter.h

Index: chromeos/cryptohome/system_salt_getter.h
diff --git a/chromeos/cryptohome/system_salt_getter.h b/chromeos/cryptohome/system_salt_getter.h
index a42dd251f8bf96067ae360e6c7f9e91ec7b84823..8654e50635181b2e6a9b94b4c8f66886c126108b 100644
--- a/chromeos/cryptohome/system_salt_getter.h
+++ b/chromeos/cryptohome/system_salt_getter.h
@@ -24,8 +24,6 @@
   typedef base::Callback<void(const std::string& system_salt)>
       GetSystemSaltCallback;
 
-  using RawSalt = std::vector<uint8_t>;
-
   // Manage an explicitly initialized global instance.
   static void Initialize();
   static bool IsInitialized();
@@ -33,18 +31,12 @@
   static SystemSaltGetter* Get();
 
   // Converts |salt| to a hex encoded string.
-  static std::string ConvertRawSaltToHexString(const RawSalt& salt);
+  static std::string ConvertRawSaltToHexString(
+      const std::vector<uint8_t>& salt);
 
   // Returns system hash in hex encoded ascii format. Note: this may return
   // an empty string (e.g. errors in D-Bus layer)
   void GetSystemSalt(const GetSystemSaltCallback& callback);
-
-  // Returns pointer to binary system salt if it is already known.
-  // Returns nullptr if system salt is not known.
-  const RawSalt* GetRawSalt() const;
-
-  // This is for browser tests API.
-  void SetRawSaltForTesting(const RawSalt& raw_salt);
 
  protected:
   SystemSaltGetter();
@@ -56,9 +48,8 @@
                                       bool service_is_available);
   void DidGetSystemSalt(const GetSystemSaltCallback& callback,
                         DBusMethodCallStatus call_status,
-                        const RawSalt& system_salt);
+                        const std::vector<uint8_t>& system_salt);
 
-  RawSalt raw_salt_;
   std::string system_salt_;
 
   base::WeakPtrFactory<SystemSaltGetter> weak_ptr_factory_;