| Index: net/base/keygen_handler_openssl.cc
 | 
| diff --git a/net/base/keygen_handler_openssl.cc b/net/base/keygen_handler_openssl.cc
 | 
| index edd0eb110b4e5b131f34151dab7ab13a862378d3..aeb64a8b543e4308aa2574237250544b4fe32f51 100644
 | 
| --- a/net/base/keygen_handler_openssl.cc
 | 
| +++ b/net/base/keygen_handler_openssl.cc
 | 
| @@ -10,6 +10,7 @@
 | 
|  #include "base/memory/scoped_ptr.h"
 | 
|  #include "crypto/openssl_util.h"
 | 
|  #include "crypto/rsa_private_key.h"
 | 
| +#include "crypto/scoped_openssl_types.h"
 | 
|  #include "net/base/openssl_private_key_store.h"
 | 
|  
 | 
|  namespace net {
 | 
| @@ -22,8 +23,8 @@ std::string KeygenHandler::GenKeyAndSignChallenge() {
 | 
|    if (stores_key_)
 | 
|      OpenSSLPrivateKeyStore::StoreKeyPair(url_, pkey);
 | 
|  
 | 
| -  crypto::ScopedOpenSSL<NETSCAPE_SPKI, NETSCAPE_SPKI_free> spki(
 | 
| -       NETSCAPE_SPKI_new());
 | 
| +  crypto::ScopedOpenSSL<NETSCAPE_SPKI, NETSCAPE_SPKI_free>::Type spki(
 | 
| +      NETSCAPE_SPKI_new());
 | 
|    ASN1_STRING_set(spki.get()->spkac->challenge,
 | 
|                    challenge_.data(), challenge_.size());
 | 
|    NETSCAPE_SPKI_set_pubkey(spki.get(), pkey);
 | 
| 
 |