Append a trailing slash on file directory URLs. Thus a link to /directory wil...

net/url_request/url_request_file_job.cc

 // Copyright (c) 2006-2008 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.
 
 // For loading files, we make use of overlapped i/o to ensure that reading from
 // the filesystem (e.g., a network filesystem) does not block the calling
 // thread.  An alternative approach would be to use a background thread or pool
 // of threads, but it seems better to leverage the operating system's ability
 // to do background file reads for us.
 //
@@ skipping 54 matching lines @@
 
   Lock lock_;
   MessageLoop* owner_loop_;
 };
 #endif
 
 // static
 URLRequestJob* URLRequestFileJob::Factory(
     URLRequest* request, const std::string& scheme) {
   FilePath file_path;
-  if (net::FileURLToFilePath(request->url(), &file_path)) {
-    if (file_util::DirectoryExists(file_path)) {
-      // Only directories have trailing slashes.
+  if (net::FileURLToFilePath(request->url(), &file_path) &&
+      file_util::EnsureEndsWithSeparator(&file_path))
       return new URLRequestFileDirJob(request, file_path);
-    }
-  }
 
   // Use a regular file request job for all non-directories (including invalid
   // file names).
   URLRequestFileJob* job = new URLRequestFileJob(request);
   job->file_path_ = file_path;
   return job;
 }
 
 URLRequestFileJob::URLRequestFileJob(URLRequest* request)
     : URLRequestJob(request),
@@ skipping 69 matching lines @@
 void URLRequestFileJob::DidResolve(
     bool exists, const file_util::FileInfo& file_info) {
 #if defined(OS_WIN)
   async_resolver_ = NULL;
 #endif
 
   // We may have been orphaned...
   if (!request_)
     return;
 
-  is_directory_ = file_info.is_directory;
+  DCHECK(!file_info.is_directory);
 
   int rv = net::OK;
   if (!exists) {
     rv = net::ERR_FILE_NOT_FOUND;
-  } else if (!is_directory_) {
-    int flags = base::PLATFORM_FILE_OPEN | 
+  } else {
+    int flags = base::PLATFORM_FILE_OPEN |
                 base::PLATFORM_FILE_READ |
                 base::PLATFORM_FILE_ASYNC;
     rv = stream_.Open(file_path_.ToWStringHack(), flags);
   }
 
   if (rv == net::OK) {
     set_expected_content_size(file_info.size);
     NotifyHeadersComplete();
   } else {
     NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, rv));
   }
 }
 
 void URLRequestFileJob::DidRead(int result) {
   if (result > 0) {
     SetStatus(URLRequestStatus());  // Clear the IO_PENDING status
   } else if (result == 0) {
     NotifyDone(URLRequestStatus());
   } else {
     NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, result));
   }
   NotifyReadComplete(result);
 }
 
 bool URLRequestFileJob::IsRedirectResponse(
     GURL* location, int* http_status_code) {
-  if (is_directory_) {
-    // This happens when we discovered the file is a directory, so needs a
-    // slash at the end of the path.
-    std::string new_path = request_->url().path();
-    new_path.push_back('/');
-    GURL::Replacements replacements;
-    replacements.SetPathStr(new_path);
-
-    *location = request_->url().ReplaceComponents(replacements);
-    *http_status_code = 301;  // simulate a permanent redirect
-    return true;
-  }
-
 #if defined(OS_WIN)
   std::wstring extension =
       file_util::GetFileExtensionFromPath(file_path_.value());
 
   // Follow a Windows shortcut.
   // We just resolve .lnk file, ignore others.
   if (!LowerCaseEqualsASCII(extension, "lnk"))
     return false;
 
   std::wstring new_path = file_path_.value();
   bool resolved;
   resolved = file_util::ResolveShortcut(&new_path);
 
   // If shortcut is not resolved succesfully, do not redirect.
   if (!resolved)
     return false;
 
   *location = net::FilePathToFileURL(new_path);
   *http_status_code = 301;
   return true;
 #else
   return false;
 #endif
 }