Shift URLRequestContextStorage over to taking scoped_ptrs.

chrome/browser/extensions/api/platform_keys/verify_trust_api.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/extensions/api/platform_keys/verify_trust_api.h"
 
 #include <algorithm>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
@@ skipping 159 matching lines @@
         reinterpret_cast<const char*>(vector_as_array(&cert_der)),
         cert_der.size()));
   }
   scoped_refptr<net::X509Certificate> cert_chain(
       net::X509Certificate::CreateFromDERCertChain(der_cert_chain));
   if (!cert_chain) {
     callback.Run(platform_keys::kErrorInvalidX509Cert, 0, 0);
     return;
   }
 
-  net::CertVerifier* verifier = nullptr;
-  if (ContainsKey(extension_to_verifier_, extension_id)) {
-    verifier = extension_to_verifier_[extension_id].get();
-  } else {
-    verifier = net::CertVerifier::CreateDefault();
-    extension_to_verifier_[extension_id] = make_linked_ptr(verifier);
+  if (!ContainsKey(extension_to_verifier_, extension_id)) {
+    extension_to_verifier_[extension_id] =
+        make_linked_ptr(net::CertVerifier::CreateDefault().release());
   }
+  net::CertVerifier* verifier = extension_to_verifier_[extension_id].get();
 
   scoped_ptr<net::CertVerifyResult> verify_result(new net::CertVerifyResult);
   scoped_ptr<net::BoundNetLog> net_log(new net::BoundNetLog);
   const int flags = 0;
 
   std::string ocsp_response;
   net::CertVerifyResult* const verify_result_ptr = verify_result.get();
 
   RequestState* request_state = new RequestState();
   base::Callback<void(int)> bound_callback(
@@ skipping 21 matching lines @@
     scoped_ptr<net::CertVerifyResult> verify_result,
     RequestState* request_state,
     int return_value) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   callback.Run(std::string() /* no error message */, return_value,
                verify_result->cert_status);
 }
 
 }  // namespace extensions