Fix various issues in RedirectToFileResourceHandler.

net/url_request/url_request_test_job.h

 // 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.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_TEST_JOB_H_
 #define NET_URL_REQUEST_URL_REQUEST_TEST_JOB_H_
 
 #include <string>
 
 #include "base/memory/weak_ptr.h"
 #include "net/base/load_timing_info.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
+#include "net/url_request/url_request_job_factory.h"
 
 namespace net {
 
 // This job type is designed to help with simple unit tests. To use, you
 // probably want to inherit from it to set up the state you want. Then install
 // it as the protocol handler for the "test" scheme.
 //
 // It will respond to several URLs, which you can retrieve using the test_url*
 // getters, which will in turn respond with the corresponding responses returned
 // by test_data*. Any other URLs that begin with "test:" will return an error,
@@ skipping 72 matching lines @@
   // Should not be altered after the job has started.
   bool auto_advance() { return auto_advance_; }
   void set_auto_advance(bool auto_advance) { auto_advance_ = auto_advance; }
 
   void set_load_timing_info(const LoadTimingInfo& load_timing_info) {
     load_timing_info_ = load_timing_info;
   }
 
   RequestPriority priority() const { return priority_; }
 
-  // Factory method for protocol factory registration if callers don't subclass
-  static URLRequest::ProtocolFactory Factory;
+  // Create a protocol handler for callers that don't subclass.
+  static URLRequestJobFactory::ProtocolHandler* CreateProtocolHandler();
 
   // Job functions
   virtual void SetPriority(RequestPriority priority) OVERRIDE;
   virtual void Start() OVERRIDE;
   virtual bool ReadRawData(IOBuffer* buf,
                            int buf_size,
                            int *bytes_read) OVERRIDE;
   virtual void Kill() OVERRIDE;
   virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
   virtual void GetResponseInfo(HttpResponseInfo* info) OVERRIDE;
@@ skipping 48 matching lines @@
   int async_buf_size_;
 
   LoadTimingInfo load_timing_info_;
 
   base::WeakPtrFactory<URLRequestTestJob> weak_factory_;
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_TEST_JOB_H_