Use BoringSSL scopers in //net.

net/ssl/openssl_client_key_store.cc

Index: net/ssl/openssl_client_key_store.cc
diff --git a/net/ssl/openssl_client_key_store.cc b/net/ssl/openssl_client_key_store.cc
index c92f941ddf9cca2fcdcc9da75d013c025881f459..e205d4f926c4f71ec8f9de886aa36730bb1f2527 100644
--- a/net/ssl/openssl_client_key_store.cc
+++ b/net/ssl/openssl_client_key_store.cc
@@ -11,8 +11,6 @@
 #include <utility>
 
 #include "base/memory/singleton.h"
-#include "crypto/auto_cbb.h"
-#include "crypto/scoped_openssl_types.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_private_key.h"
 
@@ -22,13 +20,13 @@ namespace {
 
 // Serializes the SubjectPublicKeyInfo for |cert|.
 bool GetCertificateSPKI(const X509Certificate* cert, std::string* spki) {
-  crypto::ScopedEVP_PKEY pkey(X509_get_pubkey(cert->os_cert_handle()));
+  bssl::UniquePtr<EVP_PKEY> pkey(X509_get_pubkey(cert->os_cert_handle()));
   if (!pkey) {
     LOG(ERROR) << "Can't extract private key from certificate!";
     return false;
   }
 
-  crypto::AutoCBB cbb;
+  bssl::ScopedCBB cbb;
   uint8_t* der;
   size_t der_len;
   if (!CBB_init(cbb.get(), 0) ||