Index: content/browser/resource_context_impl.cc |
diff --git a/content/browser/resource_context_impl.cc b/content/browser/resource_context_impl.cc |
index 017e08dc3c9f85ed3fef7872524502be1bc09f6c..efe7f517a4a178fc06e5ed4d1ac966be638417f9 100644 |
--- a/content/browser/resource_context_impl.cc |
+++ b/content/browser/resource_context_impl.cc |
@@ -8,6 +8,7 @@ |
#include "base/bind.h" |
#include "base/logging.h" |
+#include "base/memory/ptr_util.h" |
#include "content/browser/fileapi/chrome_blob_storage_context.h" |
#include "content/browser/loader/resource_dispatcher_host_impl.h" |
#include "content/browser/loader/resource_request_info_impl.h" |
@@ -62,16 +63,16 @@ ResourceContext::SaltCallback ResourceContext::GetMediaDeviceIDSalt() { |
return base::Bind(&ReturnEmptySalt); |
} |
-scoped_ptr<net::ClientCertStore> ResourceContext::CreateClientCertStore() { |
- return scoped_ptr<net::ClientCertStore>(); |
+std::unique_ptr<net::ClientCertStore> ResourceContext::CreateClientCertStore() { |
+ return std::unique_ptr<net::ClientCertStore>(); |
} |
void ResourceContext::CreateKeygenHandler( |
uint32_t key_size_in_bits, |
const std::string& challenge_string, |
const GURL& url, |
- const base::Callback<void(scoped_ptr<net::KeygenHandler>)>& callback) { |
- callback.Run(make_scoped_ptr( |
+ const base::Callback<void(std::unique_ptr<net::KeygenHandler>)>& callback) { |
+ callback.Run(base::WrapUnique( |
new net::KeygenHandler(key_size_in_bits, challenge_string, url))); |
} |