diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-09 14:22:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-05-09 15:11:45 +0000 |
| commit | 2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch) | |
| tree | e75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/crypto/scoped_nss_types.h | |
| parent | a4f3d46271c57e8155ba912df46a05559d14726e (diff) | |
| download | qtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz | |
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion.
Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/crypto/scoped_nss_types.h')
| -rw-r--r-- | chromium/crypto/scoped_nss_types.h | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/chromium/crypto/scoped_nss_types.h b/chromium/crypto/scoped_nss_types.h index 8e96e8d4e20..a7395654069 100644 --- a/chromium/crypto/scoped_nss_types.h +++ b/chromium/crypto/scoped_nss_types.h @@ -10,7 +10,7 @@ #include <pk11pub.h> #include <plarena.h> -#include "base/memory/scoped_ptr.h" +#include <memory> namespace crypto { @@ -29,29 +29,33 @@ struct NSSDestroyer1 { }; // Define some convenient scopers around NSS pointers. -typedef scoped_ptr<PK11Context, - NSSDestroyer1<PK11Context, PK11_DestroyContext, PR_TRUE> > +typedef std::unique_ptr< + PK11Context, + NSSDestroyer1<PK11Context, PK11_DestroyContext, PR_TRUE>> ScopedPK11Context; -typedef scoped_ptr<PK11SlotInfo, NSSDestroyer<PK11SlotInfo, PK11_FreeSlot> > +typedef std::unique_ptr<PK11SlotInfo, NSSDestroyer<PK11SlotInfo, PK11_FreeSlot>> ScopedPK11Slot; -typedef scoped_ptr<PK11SlotList, NSSDestroyer<PK11SlotList, PK11_FreeSlotList> > +typedef std::unique_ptr<PK11SlotList, + NSSDestroyer<PK11SlotList, PK11_FreeSlotList>> ScopedPK11SlotList; -typedef scoped_ptr<PK11SymKey, NSSDestroyer<PK11SymKey, PK11_FreeSymKey> > +typedef std::unique_ptr<PK11SymKey, NSSDestroyer<PK11SymKey, PK11_FreeSymKey>> ScopedPK11SymKey; -typedef scoped_ptr<SECKEYPublicKey, - NSSDestroyer<SECKEYPublicKey, SECKEY_DestroyPublicKey> > +typedef std::unique_ptr<SECKEYPublicKey, + NSSDestroyer<SECKEYPublicKey, SECKEY_DestroyPublicKey>> ScopedSECKEYPublicKey; -typedef scoped_ptr<SECKEYPrivateKey, - NSSDestroyer<SECKEYPrivateKey, SECKEY_DestroyPrivateKey> > +typedef std::unique_ptr< + SECKEYPrivateKey, + NSSDestroyer<SECKEYPrivateKey, SECKEY_DestroyPrivateKey>> ScopedSECKEYPrivateKey; -typedef scoped_ptr<SECAlgorithmID, - NSSDestroyer1<SECAlgorithmID, SECOID_DestroyAlgorithmID, - PR_TRUE> > +typedef std::unique_ptr< + SECAlgorithmID, + NSSDestroyer1<SECAlgorithmID, SECOID_DestroyAlgorithmID, PR_TRUE>> ScopedSECAlgorithmID; -typedef scoped_ptr<SECItem, NSSDestroyer1<SECItem, SECITEM_FreeItem, PR_TRUE> > +typedef std::unique_ptr<SECItem, + NSSDestroyer1<SECItem, SECITEM_FreeItem, PR_TRUE>> ScopedSECItem; -typedef scoped_ptr<PLArenaPool, - NSSDestroyer1<PLArenaPool, PORT_FreeArena, PR_FALSE> > +typedef std::unique_ptr<PLArenaPool, + NSSDestroyer1<PLArenaPool, PORT_FreeArena, PR_FALSE>> ScopedPLArenaPool; } // namespace crypto |