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

This is a refactor and shouldn't have any visible behavioral change.

BUG=crbug.com/142945
TEST=browser_tests --single_process --gtest_filter=FullscreenControllerTest.FullscreenFileURL

Review URL: https://chromiumcodereview.appspot.com/10700117

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152381 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 7 deletions

diff --git a/net/url_request/url_request_file_job.h b/net/url_request/url_request_file_job.h
index e2b39a58..011a894 100644
--- a/net/url_request/url_request_file_job.h
+++ b/net/url_request/url_request_file_job.h
@@ -24,7 +24,9 @@ namespace net {
 // A request job that handles reading file URLs
 class NET_EXPORT URLRequestFileJob : public URLRequestJob {
  public:
-  URLRequestFileJob(URLRequest* request, const FilePath& file_path);
+  URLRequestFileJob(URLRequest* request,
+                    const FilePath& file_path,
+                    NetworkDelegate* network_delegate);
 
   static URLRequest::ProtocolFactory Factory;
 
@@ -52,12 +54,6 @@ class NET_EXPORT URLRequestFileJob : public URLRequestJob {
   FilePath file_path_;
 
  private:
-  // Tests to see if access to |path| is allowed. If g_allow_file_access_ is
-  // true, then this will return true. If the NetworkDelegate associated with
-  // the |request| says it's OK, then this will also return true.
-  static bool IsFileAccessAllowed(const URLRequest& request,
-                                  const FilePath& path);
-
   // Callback after fetching file info on a background thread.
   void DidResolve(bool exists, const base::PlatformFileInfo& file_info);