Replaced static URLRequestFileJob factory with non-static protocol handler for File jobs

net/url_request/url_request_file_job.cc

 // Copyright (c) 2012 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 66 matching lines @@
       owner_->DidResolve(exists, file_info);
   }
 
   URLRequestFileJob* owner_;
 
   base::Lock lock_;
   MessageLoop* owner_loop_;
 };
 
 URLRequestFileJob::URLRequestFileJob(URLRequest* request,
-                                     const FilePath& file_path)
-    : URLRequestJob(request, request->context()->network_delegate()),
+                                     const FilePath& file_path,
+                                     NetworkDelegate* network_delegate)
+    : URLRequestJob(request, network_delegate),
       file_path_(file_path),
       stream_(NULL),
       is_directory_(false),
       remaining_bytes_(0) {
 }
 
 // static
 URLRequestJob* URLRequestFileJob::Factory(URLRequest* request,
                                           const std::string& scheme) {
   FilePath file_path;
   const bool is_file = FileURLToFilePath(request->url(), &file_path);
 
   // Check file access permissions.
-  if (!IsFileAccessAllowed(*request, file_path)) {
+  if (!IsFileAccessAllowed(
+      *request, file_path, request->context()->network_delegate())) {
     return new URLRequestErrorJob(
         request, request->context()->network_delegate(), ERR_ACCESS_DENIED);
   }
 
   // We need to decide whether to create URLRequestFileJob for file access or
   // URLRequestFileDirJob for directory access. To avoid accessing the
   // filesystem, we only look at the path string here.
   // The code in the URLRequestFileJob::Start() method discovers that a path,
   // which doesn't end with a slash, should really be treated as a directory,
   // and it then redirects to the URLRequestFileDirJob.
   if (is_file &&
       file_util::EndsWithSeparator(file_path) &&
       file_path.IsAbsolute())
-    return new URLRequestFileDirJob(request, file_path);
+    return new URLRequestFileDirJob(request,
+                                    request->context()->network_delegate(),
+                                    file_path);
 
   // Use a regular file request job for all non-directories (including invalid
   // file names).
-  return new URLRequestFileJob(request, file_path);
+  return new URLRequestFileJob(
+      request, file_path, request->context()->network_delegate());
 }
 
 void URLRequestFileJob::Start() {
   DCHECK(!async_resolver_);
   async_resolver_ = new AsyncResolver(this);
   base::WorkerPool::PostTask(
       FROM_HERE,
       base::Bind(&AsyncResolver::Resolve, async_resolver_.get(), file_path_),
       true);
 }
@@ skipping 116 matching lines @@
         // requests.
         NotifyDone(URLRequestStatus(URLRequestStatus::FAILED,
                                     ERR_REQUEST_RANGE_NOT_SATISFIABLE));
       }
     }
   }
 }
 
 // static
 bool URLRequestFileJob::IsFileAccessAllowed(const URLRequest& request,
-                                            const FilePath& path) {
-  const URLRequestContext* context = request.context();
-  if (!context)
-    return false;
-  const NetworkDelegate* delegate = context->network_delegate();
+                                            const FilePath& path,
+                                            NetworkDelegate* delegate) {
   if (delegate)
     return delegate->CanAccessFile(request, path);

[erikwright (departed), 2012/07/13 14:50:36]

I would just inline this at this point. Replace calls to
IsFileAccessAllowed(request, path, delegate) with (!delegate ||
delegate->CanAccessFile(request, path)).

[shalev, 2012/07/17 19:40:16]

Done.

   return false;
 }
 
 URLRequestFileJob::~URLRequestFileJob() {
   DCHECK(!async_resolver_);
 }
 
 void URLRequestFileJob::DidResolve(
     bool exists, const base::PlatformFileInfo& file_info) {
   async_resolver_ = NULL;
@@ skipping 69 matching lines @@
     NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, result));
   }
 
   remaining_bytes_ -= result;
   DCHECK_GE(remaining_bytes_, 0);
 
   NotifyReadComplete(result);
 }
 
 }  // namespace net