Add net/android/keystore.h

crypto/openssl_util.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CRYPTO_OPENSSL_UTIL_H_
 #define CRYPTO_OPENSSL_UTIL_H_
 
 #include "base/basictypes.h"
 #include "base/location.h"
 #include "crypto/crypto_export.h"
 
 namespace crypto {
 
-// A helper class that takes care of destroying OpenSSL objects when it goes out
+// A helper class that takes care of destroying OpenSSL objects when they go out
 // of scope.
 template <typename T, void (*destructor)(T*)>
 class ScopedOpenSSL {

[Ryan Sleevi, 2013/02/04 22:53:27]

As a TODO, we should move this towards using the new scoped_ptr<> classes rather
than having yet-another scoped type. It's on my radar to do the same for NSS,
just FYI.

  public:
   ScopedOpenSSL() : ptr_(NULL) { }
   explicit ScopedOpenSSL(T* ptr) : ptr_(ptr) { }
   ~ScopedOpenSSL() {
     reset(NULL);
   }
 
   T* get() const { return ptr_; }
+  T* release() {
+    T* ptr = ptr_;
+    ptr_ = NULL;
+    return ptr;
+  }
   void reset(T* ptr) {
     if (ptr != ptr_) {
       if (ptr_) (*destructor)(ptr_);
       ptr_ = ptr;
     }
   }
 
  private:
   T* ptr_;
 
@@ skipping 69 matching lines @@
 
  private:
   const tracked_objects::Location location_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(OpenSSLErrStackTracer);
 };
 
 }  // namespace crypto
 
 #endif  // CRYPTO_OPENSSL_UTIL_H_