Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Unified Diff: net/cert/x509_certificate_net_log_param.cc

Issue 1135373002: Updated NetLog::ParametersCallback & all related calbacks returning value as scoped_ptr<base::Value… Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/cert/x509_certificate_net_log_param.h ('k') | net/disk_cache/memory/mem_entry_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cert/x509_certificate_net_log_param.cc
diff --git a/net/cert/x509_certificate_net_log_param.cc b/net/cert/x509_certificate_net_log_param.cc
index 806eba32be087a38646df7fef6c8f2181c5560f7..72b1e919aa7c7ba0adafc4883909f8fa71011104 100644
--- a/net/cert/x509_certificate_net_log_param.cc
+++ b/net/cert/x509_certificate_net_log_param.cc
@@ -12,8 +12,9 @@
namespace net {
-base::Value* NetLogX509CertificateCallback(const X509Certificate* certificate,
- NetLogCaptureMode capture_mode) {
+scoped_ptr<base::Value> NetLogX509CertificateCallback(
+ const X509Certificate* certificate,
+ NetLogCaptureMode capture_mode) {
scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
scoped_ptr<base::ListValue> certs(new base::ListValue());
std::vector<std::string> encoded_chain;
@@ -21,7 +22,7 @@ base::Value* NetLogX509CertificateCallback(const X509Certificate* certificate,
for (size_t i = 0; i < encoded_chain.size(); ++i)
certs->Append(new base::StringValue(encoded_chain[i]));
dict->Set("certificates", certs.Pass());
- return dict.release();
+ return dict.Pass();
}
} // namespace net
« no previous file with comments | « net/cert/x509_certificate_net_log_param.h ('k') | net/disk_cache/memory/mem_entry_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698