Remove TaskTraits::with_file_io().

BUG=675660
TBR=jam@chromium.org,eugenebut@chromium.org

Review-Url: https://codereview.chromium.org/2629583003
Cr-Commit-Position: refs/heads/master@{#443549}

base/task_scheduler/task_traits.h

@@ -141,10 +141,6 @@ class BASE_EXPORT TaskTraits {
   // Returns true if tasks with these traits may use base/ sync primitives.
   bool with_base_sync_primitives() const { return with_base_sync_primitives_; }
 
-  // DEPRECATED
-  // TODO(fdoray): Remove this as part of crbug.com/675660
-  bool with_file_io() const { return may_block(); }
-
   // Returns the priority of tasks with these traits.
   TaskPriority priority() const { return priority_; }
 

components/task_scheduler_util/browser/initialization.cc

@@ -60,7 +60,7 @@ GetBrowserWorkerPoolParamsFromVariations() {
 size_t BrowserWorkerPoolIndexForTraits(const base::TaskTraits& traits) {
   const bool is_background =
       traits.priority() == base::TaskPriority::BACKGROUND;
-  if (traits.with_file_io())
+  if (traits.may_block() || traits.with_base_sync_primitives())
     return is_background ? BACKGROUND_FILE_IO : FOREGROUND_FILE_IO;
   return is_background ? BACKGROUND : FOREGROUND;
 }

content/browser/browser_main_loop.cc

@@ -463,7 +463,7 @@ GetDefaultSchedulerWorkerPoolParams() {
 size_t DefaultBrowserWorkerPoolIndexForTraits(const base::TaskTraits& traits) {
   const bool is_background =
       traits.priority() == base::TaskPriority::BACKGROUND;
-  if (traits.with_file_io())
+  if (traits.may_block() || traits.with_base_sync_primitives())
     return is_background ? BACKGROUND_FILE_IO : FOREGROUND_FILE_IO;
 
   return is_background ? BACKGROUND : FOREGROUND;

content/renderer/render_process_impl.cc

@@ -120,7 +120,7 @@ GetDefaultSchedulerWorkerPoolParams() {
 size_t DefaultRendererWorkerPoolIndexForTraits(const base::TaskTraits& traits) {
   const bool is_background =
       traits.priority() == base::TaskPriority::BACKGROUND;
-  if (traits.with_file_io())
+  if (traits.may_block() || traits.with_base_sync_primitives())
     return is_background ? BACKGROUND_FILE_IO : FOREGROUND_FILE_IO;
 
   return is_background ? BACKGROUND : FOREGROUND;

ios/web/app/web_main_loop.mm

@@ -78,7 +78,7 @@ GetDefaultSchedulerWorkerPoolParams() {
 size_t DefaultBrowserWorkerPoolIndexForTraits(const base::TaskTraits& traits) {
   const bool is_background =
       traits.priority() == base::TaskPriority::BACKGROUND;
-  if (traits.with_file_io())
+  if (traits.may_block() || traits.with_base_sync_primitives())
     return is_background ? BACKGROUND_FILE_IO : FOREGROUND_FILE_IO;
 
   return is_background ? BACKGROUND : FOREGROUND;