diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 05:16:24 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 05:16:24 +0000 |
| commit | 49835bb9e7819568a37a07e27f3cee7e1778ec34 (patch) | |
| tree | ad26442c6ed04c52bc1b60a2dd77f38328c82f27 /chromeos/cryptohome | |
| parent | cc5c016313731d29edbb5d55014b899d73d6a3ff (diff) | |
| download | chromium_src-49835bb9e7819568a37a07e27f3cee7e1778ec34.zip chromium_src-49835bb9e7819568a37a07e27f3cee7e1778ec34.tar.gz chromium_src-49835bb9e7819568a37a07e27f3cee7e1778ec34.tar.bz2 | |
settings: Add async system salt retrieval logic in DeviceOAuth2TokenServiceFactory
Along the way, remove GetCachedSystemSalt() from SystemSaltGetter.
BUG=309959, 306547
TEST=none
R=hashimoto@chromium.org, pastarmovj@chromium.org
Review URL: https://codereview.chromium.org/39443002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/cryptohome')
| -rw-r--r-- | chromeos/cryptohome/system_salt_getter.cc | 4 | ||||
| -rw-r--r-- | chromeos/cryptohome/system_salt_getter.h | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/chromeos/cryptohome/system_salt_getter.cc b/chromeos/cryptohome/system_salt_getter.cc index f299f0f..1fa25a3 100644 --- a/chromeos/cryptohome/system_salt_getter.cc +++ b/chromeos/cryptohome/system_salt_getter.cc @@ -38,10 +38,6 @@ std::string SystemSaltGetter::GetSystemSaltSync() { return system_salt_; } -std::string SystemSaltGetter::GetCachedSystemSalt() { - return system_salt_; -} - void SystemSaltGetter::GetSystemSaltInternal( const GetSystemSaltCallback& callback, bool service_is_available) { diff --git a/chromeos/cryptohome/system_salt_getter.h b/chromeos/cryptohome/system_salt_getter.h index a47b617..1e4cf81 100644 --- a/chromeos/cryptohome/system_salt_getter.h +++ b/chromeos/cryptohome/system_salt_getter.h @@ -40,11 +40,6 @@ class CHROMEOS_EXPORT SystemSaltGetter { // DEPRECATED: DO NOT USE. std::string GetSystemSaltSync(); - // Returns system hash in hex encoded ascii format, cached by a prior call - // to GetSystemSalt(). Note: this may return an empty string (e.g. if - // GetSystemSalt() is not yet called). - std::string GetCachedSystemSalt(); - protected: SystemSaltGetter(); ~SystemSaltGetter(); |