Use TaskScheduler instead of blocking pool in nacl_file_host.cc.

components/nacl/browser/nacl_file_host.cc

 // 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.
 
 #include "components/nacl/browser/nacl_file_host.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/task_scheduler/post_task.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/nacl/browser/bad_message.h"
 #include "components/nacl/browser/nacl_browser.h"
 #include "components/nacl/browser/nacl_browser_delegate.h"
 #include "components/nacl/browser/nacl_host_message_filter.h"
 #include "components/nacl/common/nacl_host_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "ipc/ipc_platform_file.h"
@@ skipping 40 matching lines @@
 
   write_reply_message(reply_msg, file_desc, file_token_lo, file_token_hi);
   nacl_host_message_filter->Send(reply_msg);
 }
 
 void DoOpenPnaclFile(
     scoped_refptr<nacl::NaClHostMessageFilter> nacl_host_message_filter,
     const std::string& filename,
     bool is_executable,
     IPC::Message* reply_msg) {
-  DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
   base::FilePath full_filepath;
 
   // PNaCl must be installed.
   base::FilePath pnacl_dir;
   if (!nacl::NaClBrowser::GetDelegate()->GetPnaclDirectory(&pnacl_dir) ||
       !base::PathExists(pnacl_dir)) {
     NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
     return;
   }
 
@@ skipping 33 matching lines @@
 }
 
 // Convert the file URL into a file descriptor.
 // This function is security sensitive.  Be sure to check with a security
 // person before you modify it.
 void DoOpenNaClExecutableOnThreadPool(
     scoped_refptr<nacl::NaClHostMessageFilter> nacl_host_message_filter,
     const GURL& file_url,
     bool enable_validation_caching,
     IPC::Message* reply_msg) {
-  DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
-
   base::FilePath file_path;
   if (!nacl::NaClBrowser::GetDelegate()->MapUrlToLocalFilePath(
           file_url,
           true /* use_blocking_api */,
           nacl_host_message_filter->profile_directory(),
           &file_path)) {
     NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
     return;
   }
 
@@ skipping 31 matching lines @@
 
 }  // namespace
 
 namespace nacl_file_host {
 
 void GetReadonlyPnaclFd(
     scoped_refptr<nacl::NaClHostMessageFilter> nacl_host_message_filter,
     const std::string& filename,
     bool is_executable,
     IPC::Message* reply_msg) {
-  if (!BrowserThread::PostBlockingPoolTask(
-          FROM_HERE,
-          base::Bind(&DoOpenPnaclFile,
-                     nacl_host_message_filter,
-                     filename,
-                     is_executable,
-                     reply_msg))) {
-    NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
-  }
+  base::PostTaskWithTraits(
+      FROM_HERE, base::TaskTraits().MayBlock(),
+      base::Bind(&DoOpenPnaclFile, nacl_host_message_filter, filename,
+                 is_executable, reply_msg));
 }
 
 // This function is security sensitive.  Be sure to check with a security
 // person before you modify it.
 bool PnaclCanOpenFile(const std::string& filename,
                       base::FilePath* file_to_open) {
   if (filename.length() > kMaxFileLength)
     return false;
 
   if (filename.empty())
@@ skipping 57 matching lines @@
   if (!content::SiteInstance::IsSameWebSite(site_instance->GetBrowserContext(),
                                             site_instance->GetSiteURL(),
                                             file_url)) {
     NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
     return;
   }
 
   // The URL is part of the current app. Now query the extension system for the
   // file path and convert that to a file descriptor. This should be done on a
   // blocking pool thread.
-  if (!BrowserThread::PostBlockingPoolTask(
-      FROM_HERE,
-      base::Bind(
-          &DoOpenNaClExecutableOnThreadPool,
-          nacl_host_message_filter,
-          file_url,
-          enable_validation_caching,
-          reply_msg))) {
-    NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
-  }
+  base::PostTaskWithTraits(
+      FROM_HERE, base::TaskTraits().MayBlock(),
+      base::Bind(&DoOpenNaClExecutableOnThreadPool, nacl_host_message_filter,
+                 file_url, enable_validation_caching, reply_msg));
 }
 
 }  // namespace nacl_file_host