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

Unified Diff: components/ownership/owner_key_util.h

Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-nss-certs
Patch Set: rebase Created 5 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
« no previous file with comments | « components/ownership/mock_owner_key_util.cc ('k') | components/ownership/owner_key_util_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/ownership/owner_key_util.h
diff --git a/components/ownership/owner_key_util.h b/components/ownership/owner_key_util.h
index 7e2f15ee0c9e1427c7e62f794f165067a34e71cb..39201807704f807c53066713bdab70263be7ec86 100644
--- a/components/ownership/owner_key_util.h
+++ b/components/ownership/owner_key_util.h
@@ -15,10 +15,10 @@
#include "base/stl_util.h"
#include "components/ownership/ownership_export.h"
-#if defined(USE_NSS)
+#if defined(USE_NSS_CERTS)
struct PK11SlotInfoStr;
typedef struct PK11SlotInfoStr PK11SlotInfo;
-#endif // defined(USE_NSS)
+#endif // defined(USE_NSS_CERTS)
namespace crypto {
class RSAPrivateKey;
@@ -81,14 +81,14 @@ class OWNERSHIP_EXPORT OwnerKeyUtil
// returns true and populates |output|. False on failure.
virtual bool ImportPublicKey(std::vector<uint8>* output) = 0;
-#if defined(USE_NSS)
+#if defined(USE_NSS_CERTS)
// Looks for the private key associated with |key| in the |slot|
// and returns it if it can be found. Returns NULL otherwise.
// Caller takes ownership.
virtual crypto::RSAPrivateKey* FindPrivateKeyInSlot(
const std::vector<uint8>& key,
PK11SlotInfo* slot) = 0;
-#endif // defined(USE_NSS)
+#endif // defined(USE_NSS_CERTS)
// Checks whether the public key is present in the file system.
virtual bool IsPublicKeyPresent() = 0;
« no previous file with comments | « components/ownership/mock_owner_key_util.cc ('k') | components/ownership/owner_key_util_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698