Chromium Code Reviews| Index: content/browser/loader/temporary_file_stream.cc | 
| diff --git a/content/browser/loader/temporary_file_stream.cc b/content/browser/loader/temporary_file_stream.cc | 
| index 74ca4920b4a76cf696fb2421491118880c8d7e1d..f1493e705bb1741c99cad9471fcbacda4d52cd1f 100644 | 
| --- a/content/browser/loader/temporary_file_stream.cc | 
| +++ b/content/browser/loader/temporary_file_stream.cc | 
| @@ -10,6 +10,7 @@ | 
| #include "base/callback.h" | 
| #include "base/files/file_proxy.h" | 
| #include "base/memory/ref_counted.h" | 
| +#include "base/task_scheduler/post_task.h" | 
| #include "content/public/browser/browser_thread.h" | 
| #include "net/base/file_stream.h" | 
| #include "storage/browser/blob/shareable_file_reference.h" | 
| @@ -20,10 +21,12 @@ namespace content { | 
| namespace { | 
| -void DidCreateTemporaryFile(const CreateTemporaryFileStreamCallback& callback, | 
| - std::unique_ptr<base::FileProxy> file_proxy, | 
| - base::File::Error error_code, | 
| - const base::FilePath& file_path) { | 
| +void DidCreateTemporaryFile( | 
| + const CreateTemporaryFileStreamCallback& callback, | 
| + std::unique_ptr<base::FileProxy> file_proxy, | 
| + scoped_refptr<base::SequencedTaskRunner> task_runner, | 
| + base::File::Error error_code, | 
| + const base::FilePath& file_path) { | 
| DCHECK_CURRENTLY_ON(BrowserThread::IO); | 
| if (!file_proxy->IsValid()) { | 
| @@ -31,9 +34,6 @@ void DidCreateTemporaryFile(const CreateTemporaryFileStreamCallback& callback, | 
| return; | 
| } | 
| - scoped_refptr<base::TaskRunner> task_runner = | 
| - BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE); | 
| - | 
| // Cancelled or not, create the deletable_file so the temporary is cleaned up. | 
| scoped_refptr<ShareableFileReference> deletable_file = | 
| ShareableFileReference::GetOrCreate( | 
| @@ -53,12 +53,18 @@ void CreateTemporaryFileStream( | 
| const CreateTemporaryFileStreamCallback& callback) { | 
| DCHECK_CURRENTLY_ON(BrowserThread::IO); | 
| - std::unique_ptr<base::FileProxy> file_proxy(new base::FileProxy( | 
| - BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE).get())); | 
| + scoped_refptr<base::SequencedTaskRunner> task_runner = | 
| + base::CreateSequencedTaskRunnerWithTraits( | 
| + {base::MayBlock(), base::TaskPriority::USER_VISIBLE, | 
| + base::TaskShutdownBehavior::BLOCK_SHUTDOWN}); | 
| 
 
gab
2017/05/23 22:12:37
Does this need to block shutdown?
 
 | 
| + | 
| + std::unique_ptr<base::FileProxy> file_proxy( | 
| + new base::FileProxy(task_runner.get())); | 
| base::FileProxy* proxy = file_proxy.get(); | 
| proxy->CreateTemporary( | 
| base::File::FLAG_ASYNC, | 
| - base::Bind(&DidCreateTemporaryFile, callback, Passed(&file_proxy))); | 
| + base::Bind(&DidCreateTemporaryFile, callback, Passed(&file_proxy), | 
| + std::move(task_runner))); | 
| } | 
| } // namespace content |