Updated NetLog::ParametersCallback & all related calbacks returning value as scoped_ptr<base::Value…

net/spdy/spdy_stream.cc

Index: net/spdy/spdy_stream.cc
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc
index 97d0c9d1cea423537860570fe61271d33880cf83..5e28e70e92716291ad5a0cea30c451f43c0d4873 100644
--- a/net/spdy/spdy_stream.cc
+++ b/net/spdy/spdy_stream.cc
@@ -20,28 +20,28 @@ namespace net {
 
 namespace {
 
-base::Value* NetLogSpdyStreamErrorCallback(
+scoped_ptr<base::Value> NetLogSpdyStreamErrorCallback(
     SpdyStreamId stream_id,
     int status,
     const std::string* description,
     NetLogCaptureMode /* capture_mode */) {
-  base::DictionaryValue* dict = new base::DictionaryValue();
+  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   dict->SetInteger("stream_id", static_cast<int>(stream_id));
   dict->SetInteger("status", status);
   dict->SetString("description", *description);
-  return dict;
+  return dict.Pass();
 }
 
-base::Value* NetLogSpdyStreamWindowUpdateCallback(
+scoped_ptr<base::Value> NetLogSpdyStreamWindowUpdateCallback(
     SpdyStreamId stream_id,
     int32 delta,
     int32 window_size,
     NetLogCaptureMode /* capture_mode */) {
-  base::DictionaryValue* dict = new base::DictionaryValue();
+  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   dict->SetInteger("stream_id", stream_id);
   dict->SetInteger("delta", delta);
   dict->SetInteger("window_size", window_size);
-  return dict;
+  return dict.Pass();
 }
 
 bool ContainsUppercaseAscii(const std::string& str) {
@@ -274,10 +274,9 @@ void SpdyStream::IncreaseSendWindowSize(int32 delta_window_size) {
 
   send_window_size_ += delta_window_size;
 
-  net_log_.AddEvent(
-      NetLog::TYPE_HTTP2_STREAM_UPDATE_SEND_WINDOW,
-      base::Bind(&NetLogSpdyStreamWindowUpdateCallback, stream_id_,
-                 delta_window_size, send_window_size_));
+  net_log_.AddEvent(NetLog::TYPE_HTTP2_STREAM_UPDATE_SEND_WINDOW,
+                    base::Bind(NetLogSpdyStreamWindowUpdateCallback, stream_id_,
+                               delta_window_size, send_window_size_));
 
   PossiblyResumeIfSendStalled();
 }
@@ -299,10 +298,9 @@ void SpdyStream::DecreaseSendWindowSize(int32 delta_window_size) {
 
   send_window_size_ -= delta_window_size;
 
-  net_log_.AddEvent(
-      NetLog::TYPE_HTTP2_STREAM_UPDATE_SEND_WINDOW,
-      base::Bind(&NetLogSpdyStreamWindowUpdateCallback, stream_id_,
-                 -delta_window_size, send_window_size_));
+  net_log_.AddEvent(NetLog::TYPE_HTTP2_STREAM_UPDATE_SEND_WINDOW,
+                    base::Bind(NetLogSpdyStreamWindowUpdateCallback, stream_id_,
+                               -delta_window_size, send_window_size_));
 }
 
 void SpdyStream::OnReadBufferConsumed(
@@ -329,10 +327,9 @@ void SpdyStream::IncreaseRecvWindowSize(int32 delta_window_size) {
   DCHECK_LE(delta_window_size, kint32max - recv_window_size_);
 
   recv_window_size_ += delta_window_size;
-  net_log_.AddEvent(
-      NetLog::TYPE_HTTP2_STREAM_UPDATE_RECV_WINDOW,
-      base::Bind(&NetLogSpdyStreamWindowUpdateCallback, stream_id_,
-                 delta_window_size, recv_window_size_));
+  net_log_.AddEvent(NetLog::TYPE_HTTP2_STREAM_UPDATE_RECV_WINDOW,
+                    base::Bind(NetLogSpdyStreamWindowUpdateCallback, stream_id_,
+                               delta_window_size, recv_window_size_));
 
   unacked_recv_window_bytes_ += delta_window_size;
   if (unacked_recv_window_bytes_ > max_recv_window_size_ / 2) {
@@ -360,10 +357,9 @@ void SpdyStream::DecreaseRecvWindowSize(int32 delta_window_size) {
   }
 
   recv_window_size_ -= delta_window_size;
-  net_log_.AddEvent(
-      NetLog::TYPE_HTTP2_STREAM_UPDATE_RECV_WINDOW,
-      base::Bind(&NetLogSpdyStreamWindowUpdateCallback, stream_id_,
-                 -delta_window_size, recv_window_size_));
+  net_log_.AddEvent(NetLog::TYPE_HTTP2_STREAM_UPDATE_RECV_WINDOW,
+                    base::Bind(NetLogSpdyStreamWindowUpdateCallback, stream_id_,
+                               -delta_window_size, recv_window_size_));
 }
 
 int SpdyStream::GetPeerAddress(IPEndPoint* address) const {
@@ -627,7 +623,7 @@ SpdyMajorVersion SpdyStream::GetProtocolVersion() const {
 
 void SpdyStream::LogStreamError(int status, const std::string& description) {
   net_log_.AddEvent(NetLog::TYPE_HTTP2_STREAM_ERROR,
-                    base::Bind(&NetLogSpdyStreamErrorCallback, stream_id_,
+                    base::Bind(NetLogSpdyStreamErrorCallback, stream_id_,
                                status, &description));
 }