| Index: net/url_request/file_protocol_handler.cc
|
| diff --git a/net/url_request/file_protocol_handler.cc b/net/url_request/file_protocol_handler.cc
|
| index ceed930985cd8514ca2d7c9b1209af5e71b5880b..70dd137dc75d9880e8190fa6590549f3d1507cd6 100644
|
| --- a/net/url_request/file_protocol_handler.cc
|
| +++ b/net/url_request/file_protocol_handler.cc
|
| @@ -17,12 +17,15 @@ namespace net {
|
|
|
| FileProtocolHandler::FileProtocolHandler(
|
| const scoped_refptr<base::TaskRunner>& file_task_runner)
|
| - : file_task_runner_(file_task_runner) {}
|
| + : file_task_runner_(file_task_runner) {
|
| +}
|
|
|
| -FileProtocolHandler::~FileProtocolHandler() {}
|
| +FileProtocolHandler::~FileProtocolHandler() {
|
| +}
|
|
|
| URLRequestJob* FileProtocolHandler::MaybeCreateJob(
|
| - URLRequest* request, NetworkDelegate* network_delegate) const {
|
| + URLRequest* request,
|
| + NetworkDelegate* network_delegate) const {
|
| base::FilePath file_path;
|
| const bool is_file = FileURLToFilePath(request->url(), &file_path);
|
|
|
| @@ -38,16 +41,14 @@ URLRequestJob* FileProtocolHandler::MaybeCreateJob(
|
| // 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_path.EndsWithSeparator() &&
|
| - file_path.IsAbsolute()) {
|
| + if (is_file && file_path.EndsWithSeparator() && file_path.IsAbsolute()) {
|
| return new URLRequestFileDirJob(request, network_delegate, file_path);
|
| }
|
|
|
| // Use a regular file request job for all non-directories (including invalid
|
| // file names).
|
| - return new URLRequestFileJob(request, network_delegate, file_path,
|
| - file_task_runner_);
|
| + return new URLRequestFileJob(
|
| + request, network_delegate, file_path, file_task_runner_);
|
| }
|
|
|
| bool FileProtocolHandler::IsSafeRedirectTarget(const GURL& location) const {
|
|
|