Separate the parent directory link in FTP listings.

content/child/ftp_directory_listing_response_delegate.cc

 // Copyright 2014 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 "content/child/ftp_directory_listing_response_delegate.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
@@ skipping 47 matching lines @@
 
 namespace content {
 
 FtpDirectoryListingResponseDelegate::FtpDirectoryListingResponseDelegate(
     WebURLLoaderClient* client,
     WebURLLoader* loader,
     const WebURLResponse& response)
     : client_(client),
       loader_(loader) {
   if (response.GetExtraData()) {
-    // extraData can be NULL during tests.
+    // |extra_data| can be NULL during tests.
     WebURLResponseExtraDataImpl* extra_data =
         static_cast<WebURLResponseExtraDataImpl*>(response.GetExtraData());
     extra_data->set_is_ftp_directory_listing(true);
   }
   Init(response.Url());
 }
 
 void FtpDirectoryListingResponseDelegate::Cancel() {
-  client_ = NULL;
-  loader_ = NULL;
+  client_ = nullptr;
+  loader_ = nullptr;
 }
 
 void FtpDirectoryListingResponseDelegate::OnReceivedData(const char* data,
                                                          int data_len) {
   buffer_.append(data, data_len);
 }
 
 void FtpDirectoryListingResponseDelegate::OnCompletedRequest() {
   std::vector<FtpDirectoryListingEntry> entries;
-  int rv = -1;
+  int rv = net::ERR_NOT_IMPLEMENTED;
 #if !BUILDFLAG(DISABLE_FTP_SUPPORT)
   rv = net::ParseFtpDirectoryListing(buffer_, base::Time::Now(), &entries);
 #endif
   if (rv != net::OK) {
     SendDataToClient("<script>onListingParsingError();</script>\n");
     return;
   }
-  for (size_t i = 0; i < entries.size(); i++) {
-    const FtpDirectoryListingEntry& entry = entries[i];
-
+  for (const FtpDirectoryListingEntry& entry : entries) {
     // Skip the current and parent directory entries in the listing. Our header
     // always includes them.
     if (base::EqualsASCII(entry.name, ".") ||
         base::EqualsASCII(entry.name, ".."))
       continue;
 
     bool is_directory = (entry.type == FtpDirectoryListingEntry::DIRECTORY);
-    int64_t size = entry.size;
-    if (entry.type != FtpDirectoryListingEntry::FILE)
-      size = 0;
+    int64_t size =
+        entry.type == FtpDirectoryListingEntry::FILE ? entry.size : 0;
     SendDataToClient(net::GetDirectoryListingEntry(
         entry.name, entry.raw_name, is_directory, size, entry.last_modified));
   }
 }
 
 void FtpDirectoryListingResponseDelegate::Init(const GURL& response_url) {
   net::UnescapeRule::Type unescape_rules =
       net::UnescapeRule::SPACES |
       net::UnescapeRule::URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS;
   std::string unescaped_path = net::UnescapeURLComponent(response_url.path(),
                                                          unescape_rules);
   SendDataToClient(net::GetDirectoryListingHeader(
       ConvertPathToUTF16(unescaped_path)));
 
   // If this isn't top level directory (i.e. the path isn't "/",)
   // add a link to the parent directory.
   if (response_url.path().length() > 1) {
-    SendDataToClient(net::GetDirectoryListingEntry(
-        base::ASCIIToUTF16(".."), std::string(), false, 0, base::Time()));
+    SendDataToClient("<script>onHasParentDirectory();</script>\n");
   }
 }
 
 void FtpDirectoryListingResponseDelegate::SendDataToClient(
     const std::string& data) {
   if (client_) {
     client_->DidReceiveData(data.data(), data.length());
   }
 }
 
 }  // namespace content