FTP: add net-internals logging.

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/string_number_conversions.h"
 #include "base/string_piece.h"
-//#include "base/string_util.h"
+#include "base/values.h"
 #include "net/base/net_errors.h"
 
 namespace net {
 
 // static
 const int FtpCtrlResponse::kInvalidStatusCode = -1;
 
 FtpCtrlResponse::FtpCtrlResponse() : status_code(kInvalidStatusCode) {}
 
 FtpCtrlResponse::~FtpCtrlResponse() {}
 
-FtpCtrlResponseBuffer::FtpCtrlResponseBuffer() : multiline_(false) {}
+FtpCtrlResponseBuffer::FtpCtrlResponseBuffer(const BoundNetLog& net_log)
+    : multiline_(false),
+      net_log_(net_log) {
+}
 
 FtpCtrlResponseBuffer::~FtpCtrlResponseBuffer() {}
 
 int FtpCtrlResponseBuffer::ConsumeData(const char* data, int data_length) {
   buffer_.append(data, data_length);
   ExtractFullLinesFromBuffer();
 
   while (!lines_.empty()) {
     ParsedLine line = lines_.front();
     lines_.pop();
@@ skipping 33 matching lines @@
         // Prepare to handle following lines.
         response_buf_ = FtpCtrlResponse();
         line_buf_.clear();
       }
     }
   }
 
   return OK;
 }
 
+namespace {
+
+Value* NetLogFtpCtrlResponseCallback(const FtpCtrlResponse& response,
+                                     NetLog::LogLevel log_level) {
+  ListValue* lines = new ListValue();
+  lines->AppendStrings(response.lines);
+
+  DictionaryValue* dict = new DictionaryValue();
+  dict->SetInteger("status_code", response.status_code);
+  dict->Set("lines", lines);
+  return dict;
+}
+
+}  // namespace
+
 FtpCtrlResponse FtpCtrlResponseBuffer::PopResponse() {
   FtpCtrlResponse result = responses_.front();
   responses_.pop();
+
+  net_log_.AddEvent(NetLog::TYPE_FTP_CONTROL_RESPONSE,
+                    base::Bind(&NetLogFtpCtrlResponseCallback, result));

[eroman, 2012/11/06 23:49:29]

Note that this line will cause |result| to be copied.

In general we try to avoid this for the NetLogging.

Instead, you can do ConstRef(result). Or you can change the parameter to be
|const FtpCtrlResponse*|. The preferred style is the latter, since it is easier
to not mess up.

[Paweł Hajdan Jr., 2012/11/07 00:42:56]

Done.

+
   return result;
 }
 
 FtpCtrlResponseBuffer::ParsedLine::ParsedLine()
     : has_status_code(false),
       is_multiline(false),
       is_complete(false),
       status_code(FtpCtrlResponse::kInvalidStatusCode) {
 }
 
@@ skipping 31 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