Remove WallpaperManager dependency on Cryptohome.

chromeos/cryptohome/system_salt_getter.cc

 // Copyright (c) 2012 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 "chromeos/cryptohome/system_salt_getter.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 24 matching lines @@
         FROM_HERE, base::Bind(callback, system_salt_));
     return;
   }
 
   DBusThreadManager::Get()->GetCryptohomeClient()->WaitForServiceToBeAvailable(
       base::Bind(&SystemSaltGetter::DidWaitForServiceToBeAvailable,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback));
 }
 
+const SystemSaltGetter::RawSalt* SystemSaltGetter::GetRawSalt() const {
+  if (!raw_salt_.empty())

[Darren Krahn, 2016/04/13 16:33:43]

optional: candidate for a ternary operator?

 return raw_salt_.empty() ? nullptr : &raw_salt_;

[Alexander Alekseev, 2016/04/14 03:37:29]

Done.

+    return &raw_salt_;
+
+  return nullptr;
+}
+
+void SystemSaltGetter::SetRawSaltForTesting(
+    const SystemSaltGetter::RawSalt& raw_salt) {
+  raw_salt_ = raw_salt;
+}
+
 void SystemSaltGetter::DidWaitForServiceToBeAvailable(
     const GetSystemSaltCallback& callback,
     bool service_is_available) {
   if (!service_is_available) {
     LOG(ERROR) << "WaitForServiceToBeAvailable failed.";
     callback.Run(std::string());
     return;
   }
   DBusThreadManager::Get()->GetCryptohomeClient()->GetSystemSalt(
       base::Bind(&SystemSaltGetter::DidGetSystemSalt,
@@ skipping 41 matching lines @@
 }
 
 // static
 std::string SystemSaltGetter::ConvertRawSaltToHexString(
     const std::vector<uint8_t>& salt) {
   return base::ToLowerASCII(
       base::HexEncode(reinterpret_cast<const void*>(salt.data()), salt.size()));
 }
 
 }  // namespace chromeos