Don't log empty FTP LIST responses as unknown server type.

net/url_request/url_request_new_ftp_job.cc

 // Copyright (c) 2009 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/url_request/url_request_new_ftp_job.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_version_info.h"
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
@@ skipping 266 matching lines @@
   size_t bytes_to_copy = std::min(static_cast<size_t>(buf_size),
                                   directory_html_.length());
   if (bytes_to_copy) {
     memcpy(buf->data(), directory_html_.c_str(), bytes_to_copy);
     directory_html_.erase(0, bytes_to_copy);
   }
   return bytes_to_copy;
 }
 
 void URLRequestNewFtpJob::LogFtpServerType(const net::ListState& list_state) {
+  // We can't recognize server type based on empty directory listings. Don't log
+  // that as unknown, it's misleading.
+  if (!list_state.parsed_one)

[eroman, 2009/09/08 22:20:14]

Style comment:

I recommend doing this at the callsite of LogFtpServerType:

if (state.parsed_one)
  LogFtpServerType(state);

And have LogFtpServerType() DCHECK that parsed_one is true.

Since otherwise it seems awkward to call LogFtpServerType() and have it do
nothing.

[wtc, 2009/09/09 01:14:50]

I agree.  I also suggest that we change
LogFtpServerType to take state.lstyle as the argument,
which is all it neeeds.

+    return;
+
   switch (list_state.lstyle) {
     case 'E':
       net::UpdateFtpServerTypeHistograms(net::SERVER_EPLF);
       break;
     case 'V':
       net::UpdateFtpServerTypeHistograms(net::SERVER_VMS);
       break;
     case 'C':
       net::UpdateFtpServerTypeHistograms(net::SERVER_CMS);
       break;
@@ skipping 102 matching lines @@
   MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
       this, &URLRequestNewFtpJob::OnStartCompleted, rv));
 }
 
 void URLRequestNewFtpJob::DestroyTransaction() {
   DCHECK(transaction_.get());
 
   transaction_.reset();
   response_info_ = NULL;
 }