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

Unified Diff: net/ssl/openssl_ssl_util.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/spdy/spdy_stream.cc ('k') | net/ssl/ssl_config.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ssl/openssl_ssl_util.cc
diff --git a/net/ssl/openssl_ssl_util.cc b/net/ssl/openssl_ssl_util.cc
index 54a34009323decdec570102134ac38cff908e317..59355f1f93dece825fec6d44e3230a2864f94776 100644
--- a/net/ssl/openssl_ssl_util.cc
+++ b/net/ssl/openssl_ssl_util.cc
@@ -152,11 +152,12 @@ int MapOpenSSLErrorSSL(uint32_t error_code) {
}
}
-base::Value* NetLogOpenSSLErrorCallback(int net_error,
- int ssl_error,
- const OpenSSLErrorInfo& error_info,
- NetLogCaptureMode /* capture_mode */) {
- base::DictionaryValue* dict = new base::DictionaryValue();
+scoped_ptr<base::Value> NetLogOpenSSLErrorCallback(
+ int net_error,
+ int ssl_error,
+ const OpenSSLErrorInfo& error_info,
+ NetLogCaptureMode /* capture_mode */) {
+ scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
dict->SetInteger("net_error", net_error);
dict->SetInteger("ssl_error", ssl_error);
if (error_info.error_code != 0) {
@@ -167,7 +168,7 @@ base::Value* NetLogOpenSSLErrorCallback(int net_error,
dict->SetString("file", error_info.file);
if (error_info.line != 0)
dict->SetInteger("line", error_info.line);
- return dict;
+ return dict.Pass();
}
} // namespace
@@ -236,8 +237,8 @@ NetLog::ParametersCallback CreateNetLogOpenSSLErrorCallback(
int net_error,
int ssl_error,
const OpenSSLErrorInfo& error_info) {
- return base::Bind(&NetLogOpenSSLErrorCallback,
- net_error, ssl_error, error_info);
+ return base::Bind(NetLogOpenSSLErrorCallback, net_error, ssl_error,
+ error_info);
}
} // namespace net
« no previous file with comments | « net/spdy/spdy_stream.cc ('k') | net/ssl/ssl_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698