| OLD | NEW |
|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/os_crypt/os_crypt_mocker.h" | 5 #include "components/os_crypt/os_crypt_mocker.h" |
| 6 | 6 |
| 7 #include "components/os_crypt/os_crypt.h" | 7 #include "components/os_crypt/os_crypt.h" |
| 8 | 8 |
| 9 #if defined(USE_LIBSECRET) | 9 #if defined(USE_LIBSECRET) |
| 10 #include "components/os_crypt/os_crypt_mocker_linux.h" | 10 #include "components/os_crypt/os_crypt_mocker_linux.h" |
| 11 #endif | 11 #endif |
| 12 | 12 |
| 13 // static | 13 // static |
| 14 void OSCryptMocker::SetUpWithSingleton() { | 14 void OSCryptMocker::SetUpWithSingleton() { |
| 15 #if defined(OS_MACOSX) | 15 #if defined(OS_MACOSX) |
| 16 OSCrypt::UseMockKeychain(true); | 16 OSCrypt::UseMockKeychain(true); |
| 17 #elif defined(USE_LIBSECRET) | 17 #elif defined(USE_LIBSECRET) || defined(USE_KEYRING) || defined(USE_KWALLET) |
| 18 OSCryptMockerLinux::SetUpWithSingleton(); | 18 OSCryptMockerLinux::SetUpWithSingleton(); |
| 19 #endif | 19 #endif |
| 20 } | 20 } |
| 21 | 21 |
| 22 // static | 22 // static |
| 23 void OSCryptMocker::TearDown() { | 23 void OSCryptMocker::TearDown() { |
| 24 #if defined(OS_MACOSX) | 24 #if defined(OS_MACOSX) |
| 25 OSCrypt::UseMockKeychain(false); | 25 OSCrypt::UseMockKeychain(false); |
| 26 #elif defined(USE_LIBSECRET) | 26 #elif defined(USE_LIBSECRET) || defined(USE_KEYRING) || defined(USE_KWALLET) |
| 27 OSCryptMockerLinux::TearDown(); | 27 OSCryptMockerLinux::TearDown(); |
| 28 #endif | 28 #endif |
| 29 } | 29 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2297573002:
Implement gnome-keyring for OSCrypt (Closed)
