Index: net/http/http_network_transaction.cc |
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc |
index 981fcb6abb003efef8362d272967df28d96309e0..ab3f2cab0997d9f828f3448c61d042ce6f873707 100644 |
--- a/net/http/http_network_transaction.cc |
+++ b/net/http/http_network_transaction.cc |
@@ -92,28 +92,28 @@ void ProcessAlternateProtocol( |
*session); |
} |
-base::Value* NetLogSSLVersionFallbackCallback( |
+scoped_ptr<base::Value> NetLogSSLVersionFallbackCallback( |
const GURL* url, |
int net_error, |
uint16 version_before, |
uint16 version_after, |
NetLogCaptureMode /* capture_mode */) { |
- base::DictionaryValue* dict = new base::DictionaryValue(); |
+ scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); |
dict->SetString("host_and_port", GetHostAndPort(*url)); |
dict->SetInteger("net_error", net_error); |
dict->SetInteger("version_before", version_before); |
dict->SetInteger("version_after", version_after); |
- return dict; |
+ return dict.Pass(); |
} |
-base::Value* NetLogSSLCipherFallbackCallback( |
+scoped_ptr<base::Value> NetLogSSLCipherFallbackCallback( |
const GURL* url, |
int net_error, |
NetLogCaptureMode /* capture_mode */) { |
- base::DictionaryValue* dict = new base::DictionaryValue(); |
+ scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); |
dict->SetString("host_and_port", GetHostAndPort(*url)); |
dict->SetInteger("net_error", net_error); |
- return dict; |
+ return dict.Pass(); |
} |
} // namespace |
@@ -1274,7 +1274,7 @@ int HttpNetworkTransaction::HandleSSLHandshakeError(int error) { |
error == ERR_CONNECTION_CLOSED || error == ERR_CONNECTION_RESET)) { |
net_log_.AddEvent( |
NetLog::TYPE_SSL_CIPHER_FALLBACK, |
- base::Bind(&NetLogSSLCipherFallbackCallback, &request_->url, error)); |
+ base::Bind(NetLogSSLCipherFallbackCallback, &request_->url, error)); |
server_ssl_config_.enable_deprecated_cipher_suites = true; |
ResetConnectionAndRequestForResend(); |
return OK; |
@@ -1351,9 +1351,8 @@ int HttpNetworkTransaction::HandleSSLHandshakeError(int error) { |
if (should_fallback) { |
net_log_.AddEvent( |
NetLog::TYPE_SSL_VERSION_FALLBACK, |
- base::Bind(&NetLogSSLVersionFallbackCallback, |
- &request_->url, error, server_ssl_config_.version_max, |
- version_max)); |
+ base::Bind(NetLogSSLVersionFallbackCallback, &request_->url, error, |
+ server_ssl_config_.version_max, version_max)); |
fallback_error_code_ = error; |
server_ssl_config_.version_max = version_max; |
server_ssl_config_.version_fallback = true; |