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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/os_crypt/os_crypt_mocker.cc

Issue 2297573002: Implement gnome-keyring for OSCrypt (Closed)
Patch Set: Fixed malloc - delete mismatch Created 4 years, 4 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
« components/os_crypt/key_storage_keyring_unittest.cc ('K') | « components/os_crypt/keyring_util_linux.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/os_crypt/os_crypt_mocker.cc
diff --git a/components/os_crypt/os_crypt_mocker.cc b/components/os_crypt/os_crypt_mocker.cc
index dd160cbaf5396d2fbe0c36c3c4c4381b78c24f6e..3e676c95a4ff274728161869cfda98bbddf72654 100644
--- a/components/os_crypt/os_crypt_mocker.cc
+++ b/components/os_crypt/os_crypt_mocker.cc
@@ -14,7 +14,7 @@
void OSCryptMocker::SetUpWithSingleton() {
#if defined(OS_MACOSX)
OSCrypt::UseMockKeychain(true);
-#elif defined(USE_LIBSECRET)
+#elif defined(USE_LIBSECRET) || defined(USE_KEYRING) || defined(USE_KWALLET)
OSCryptMockerLinux::SetUpWithSingleton();
#endif
}
@@ -23,7 +23,7 @@ void OSCryptMocker::SetUpWithSingleton() {
void OSCryptMocker::TearDown() {
#if defined(OS_MACOSX)
OSCrypt::UseMockKeychain(false);
-#elif defined(USE_LIBSECRET)
+#elif defined(USE_LIBSECRET) || defined(USE_KEYRING) || defined(USE_KWALLET)
OSCryptMockerLinux::TearDown();
#endif
}
« components/os_crypt/key_storage_keyring_unittest.cc ('K') | « components/os_crypt/keyring_util_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698