diff options
| -rw-r--r-- | chrome/browser/nacl_host/nacl_file_host.cc | 28 | ||||
| -rw-r--r-- | chrome/browser/nacl_host/nacl_file_host.h | 9 |
2 files changed, 19 insertions, 18 deletions
diff --git a/chrome/browser/nacl_host/nacl_file_host.cc b/chrome/browser/nacl_host/nacl_file_host.cc index 846618b..306e91d 100644 --- a/chrome/browser/nacl_host/nacl_file_host.cc +++ b/chrome/browser/nacl_host/nacl_file_host.cc @@ -55,10 +55,10 @@ bool PnaclDoOpenFile(const base::FilePath& file_to_open, } void DoOpenPnaclFile( - ChromeRenderMessageFilter* chrome_render_message_filter, + scoped_refptr<ChromeRenderMessageFilter> chrome_render_message_filter, const std::string& filename, IPC::Message* reply_msg) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); base::FilePath full_filepath; // Do some validation. @@ -89,9 +89,9 @@ void DoOpenPnaclFile( } void DoCreateTemporaryFile( - ChromeRenderMessageFilter* chrome_render_message_filter, + scoped_refptr<ChromeRenderMessageFilter> chrome_render_message_filter, IPC::Message* reply_msg) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); base::FilePath file_path; if (!file_util::CreateTemporaryFile(&file_path)) { @@ -212,13 +212,13 @@ void DoOpenNaClExecutableOnThreadPool( namespace nacl_file_host { void GetReadonlyPnaclFd( - ChromeRenderMessageFilter* chrome_render_message_filter, + scoped_refptr<ChromeRenderMessageFilter> chrome_render_message_filter, const std::string& filename, IPC::Message* reply_msg) { - if (!BrowserThread::PostTask( - BrowserThread::FILE, FROM_HERE, + if (!BrowserThread::PostBlockingPoolTask( + FROM_HERE, base::Bind(&DoOpenPnaclFile, - make_scoped_refptr(chrome_render_message_filter), + chrome_render_message_filter, filename, reply_msg))) { NotifyRendererOfError(chrome_render_message_filter, reply_msg); @@ -259,13 +259,13 @@ bool PnaclCanOpenFile(const std::string& filename, } void CreateTemporaryFile( - ChromeRenderMessageFilter* chrome_render_message_filter, + scoped_refptr<ChromeRenderMessageFilter> chrome_render_message_filter, IPC::Message* reply_msg) { - if (!BrowserThread::PostTask( - BrowserThread::FILE, FROM_HERE, - base::Bind(&DoCreateTemporaryFile, - make_scoped_refptr(chrome_render_message_filter), - reply_msg))) { + if (!BrowserThread::PostBlockingPoolTask( + FROM_HERE, + base::Bind(&DoCreateTemporaryFile, + chrome_render_message_filter, + reply_msg))) { NotifyRendererOfError(chrome_render_message_filter, reply_msg); } } diff --git a/chrome/browser/nacl_host/nacl_file_host.h b/chrome/browser/nacl_host/nacl_file_host.h index 7d2ceae..2dba7934 100644 --- a/chrome/browser/nacl_host/nacl_file_host.h +++ b/chrome/browser/nacl_host/nacl_file_host.h @@ -26,9 +26,10 @@ class Message; namespace nacl_file_host { // Open a Pnacl file (readonly) on behalf of the NaCl plugin. -void GetReadonlyPnaclFd(ChromeRenderMessageFilter* chrome_render_message_filter, - const std::string& filename, - IPC::Message* reply_msg); +void GetReadonlyPnaclFd( + scoped_refptr<ChromeRenderMessageFilter> chrome_render_message_filter, + const std::string& filename, + IPC::Message* reply_msg); // Return true if the filename requested is valid for opening. // Sets file_to_open to the base::FilePath which we will attempt to open. @@ -38,7 +39,7 @@ bool PnaclCanOpenFile(const std::string& filename, // Creates a temporary file that will be deleted when the last handle // is closed, or earlier. void CreateTemporaryFile( - ChromeRenderMessageFilter* chrome_render_message_filter, + scoped_refptr<ChromeRenderMessageFilter> chrome_render_message_filter, IPC::Message* reply_msg); // Opens a NaCl executable file for reading and executing. |