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

net/ftp/ftp_ctrl_response_buffer.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/ftp/ftp_ctrl_response_buffer.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
@@ skipping 61 matching lines @@
         line_buf_.clear();
       }
     }
   }
 
   return OK;
 }
 
 namespace {
 
-base::Value* NetLogFtpCtrlResponseCallback(const FtpCtrlResponse* response,
-                                           NetLogCaptureMode capture_mode) {
-  base::ListValue* lines = new base::ListValue();
+scoped_ptr<base::Value> NetLogFtpCtrlResponseCallback(
+    const FtpCtrlResponse* response,
+    NetLogCaptureMode capture_mode) {
+  scoped_ptr<base::ListValue> lines(new base::ListValue());
   lines->AppendStrings(response->lines);
 
-  base::DictionaryValue* dict = new base::DictionaryValue();
+  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   dict->SetInteger("status_code", response->status_code);
-  dict->Set("lines", lines);
-  return dict;
+  dict->Set("lines", lines.Pass());
+  return dict.Pass();
 }
 
 }  // namespace
 
 FtpCtrlResponse FtpCtrlResponseBuffer::PopResponse() {
   FtpCtrlResponse result = responses_.front();
   responses_.pop();
 
   net_log_.AddEvent(NetLog::TYPE_FTP_CONTROL_RESPONSE,
-                    base::Bind(&NetLogFtpCtrlResponseCallback, &result));
+                    base::Bind(NetLogFtpCtrlResponseCallback, &result));
 
   return result;
 }
 
 FtpCtrlResponseBuffer::ParsedLine::ParsedLine()
     : has_status_code(false),
       is_multiline(false),
       is_complete(false),
       status_code(FtpCtrlResponse::kInvalidStatusCode) {
 }
@@ skipping 32 matching lines @@
   for (size_t i = 0; i < buffer_.length(); i++) {
     if (i >= 1 && buffer_[i - 1] == '\r' && buffer_[i] == '\n') {
       lines_.push(ParseLine(buffer_.substr(cut_pos, i - cut_pos - 1)));
       cut_pos = i + 1;
     }
   }
   buffer_.erase(0, cut_pos);
 }
 
 }  // namespace net