Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(634)

Unified Diff: chromeos/cryptohome/system_salt_getter.cc

Issue 1886653002: Remove WallpaperManager dependency on Cryptohome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/cryptohome/system_salt_getter.cc
diff --git a/chromeos/cryptohome/system_salt_getter.cc b/chromeos/cryptohome/system_salt_getter.cc
index 0e79fc1298e1be01d350e7951b3e36667901d4cf..53330cc52575ef252556913859f5b8a1b6526098 100644
--- a/chromeos/cryptohome/system_salt_getter.cc
+++ b/chromeos/cryptohome/system_salt_getter.cc
@@ -42,6 +42,18 @@ void SystemSaltGetter::GetSystemSalt(
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? retu
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) {

Powered by Google App Engine
This is Rietveld 408576698