Remove deprecated functions from components/task_scheduler_util/.

BUG=690706

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

components/task_scheduler_util/browser/initialization.cc

@@ -20,14 +20,6 @@ namespace {
 
 constexpr char kFieldTrialName[] = "BrowserScheduler";
 
-enum WorkerPoolType : size_t {
-  BACKGROUND = 0,
-  BACKGROUND_BLOCKING,
-  FOREGROUND,
-  FOREGROUND_BLOCKING,
-  WORKER_POOL_COUNT  // Always last.
-};
-
 }  // namespace
 
 std::unique_ptr<base::TaskScheduler::InitParams>
@@ -40,27 +32,6 @@ GetBrowserTaskSchedulerInitParamsFromVariations() {
       "", variation_params, base::SchedulerBackwardCompatibility::INIT_COM_STA);
 }
 
-std::vector<base::SchedulerWorkerPoolParams>
-GetBrowserWorkerPoolParamsFromVariations() {
-  const auto init_params = GetBrowserTaskSchedulerInitParamsFromVariations();
-  if (!init_params)
-    return std::vector<base::SchedulerWorkerPoolParams>();
-
-  return std::vector<base::SchedulerWorkerPoolParams>{
-      init_params->background_worker_pool_params,
-      init_params->background_blocking_worker_pool_params,
-      init_params->foreground_worker_pool_params,
-      init_params->foreground_blocking_worker_pool_params};
-}
-
-size_t BrowserWorkerPoolIndexForTraits(const base::TaskTraits& traits) {
-  const bool is_background =
-      traits.priority() == base::TaskPriority::BACKGROUND;
-  if (traits.may_block() || traits.with_base_sync_primitives())
-    return is_background ? BACKGROUND_BLOCKING : FOREGROUND_BLOCKING;
-  return is_background ? BACKGROUND : FOREGROUND;
-}
-
 void MaybePerformBrowserTaskSchedulerRedirection() {
   // TODO(gab): Remove this when http://crbug.com/622400 concludes.
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(

components/task_scheduler_util/browser/initialization.h

@@ -5,18 +5,10 @@
 #ifndef COMPONENTS_TASK_SCHEDULER_UTIL_BROWSER_INITIALIZATION_H_
 #define COMPONENTS_TASK_SCHEDULER_UTIL_BROWSER_INITIALIZATION_H_
 
-#include <stddef.h>
-
 #include <memory>
-#include <vector>
 
-#include "base/task_scheduler/scheduler_worker_pool_params.h"
 #include "base/task_scheduler/task_scheduler.h"
 
-namespace base {
-class TaskTraits;
-}
-
 namespace task_scheduler_util {
 
 // Gets a TaskScheduler::InitParams object to initialize TaskScheduler in the
@@ -24,19 +16,6 @@ namespace task_scheduler_util {
 std::unique_ptr<base::TaskScheduler::InitParams>
 GetBrowserTaskSchedulerInitParamsFromVariations();
 
-// Gets a vector of SchedulerWorkerPoolParams to initialize TaskScheduler in the
-// browser based off variations. Returns an empty vector on failure.
-//
-// Deprecated. https://crbug.com/690706
-std::vector<base::SchedulerWorkerPoolParams>
-GetBrowserWorkerPoolParamsFromVariations();
-
-// Maps |traits| to the index of a browser worker pool vector provided by
-// GetBrowserWorkerPoolParamsFromVariations().
-//
-// Deprecated. https://crbug.com/690706
-size_t BrowserWorkerPoolIndexForTraits(const base::TaskTraits& traits);
-
 // Redirects zero-to-many PostTask APIs to the browser task scheduler based off
 // variations.
 void MaybePerformBrowserTaskSchedulerRedirection();

components/task_scheduler_util/renderer/initialization.cc

@@ -5,23 +5,10 @@
 #include "components/task_scheduler_util/renderer/initialization.h"
 
 #include "base/command_line.h"
-#include "base/task_scheduler/task_traits.h"
 #include "components/task_scheduler_util/common/variations_util.h"
 
 namespace task_scheduler_util {
 
-namespace {
-
-enum WorkerPoolType : size_t {
-  BACKGROUND = 0,
-  BACKGROUND_BLOCKING,
-  FOREGROUND,
-  FOREGROUND_BLOCKING,
-  WORKER_POOL_COUNT  // Always last.
-};
-
-}  // namespace
-
 std::unique_ptr<base::TaskScheduler::InitParams>
 GetRendererTaskSchedulerInitParamsFromCommandLine() {
   return GetTaskSchedulerInitParams(
@@ -29,24 +16,4 @@ GetRendererTaskSchedulerInitParamsFromCommandLine() {
                       *base::CommandLine::ForCurrentProcess()));
 }
 
-std::vector<base::SchedulerWorkerPoolParams> GetRendererWorkerPoolParams() {
-  const auto init_params = GetRendererTaskSchedulerInitParamsFromCommandLine();
-  if (!init_params)
-    return std::vector<base::SchedulerWorkerPoolParams>();
-
-  return std::vector<base::SchedulerWorkerPoolParams>{
-      init_params->background_worker_pool_params,
-      init_params->background_blocking_worker_pool_params,
-      init_params->foreground_worker_pool_params,
-      init_params->foreground_blocking_worker_pool_params};
-}
-
-size_t RendererWorkerPoolIndexForTraits(const base::TaskTraits& traits) {
-  const bool is_background =
-      traits.priority() == base::TaskPriority::BACKGROUND;
-  if (traits.may_block() || traits.with_base_sync_primitives())
-    return is_background ? BACKGROUND_BLOCKING : FOREGROUND_BLOCKING;
-  return is_background ? BACKGROUND : FOREGROUND;
-}
-
 }  // namespace task_scheduler_util

components/task_scheduler_util/renderer/initialization.h

@@ -5,18 +5,10 @@
 #ifndef COMPONENTS_TASK_SCHEDULER_UTIL_RENDERER_INITIALIZATION_H_
 #define COMPONENTS_TASK_SCHEDULER_UTIL_RENDERER_INITIALIZATION_H_
 
-#include <stddef.h>
-
 #include <memory>
-#include <vector>
 
-#include "base/task_scheduler/scheduler_worker_pool_params.h"
 #include "base/task_scheduler/task_scheduler.h"
 
-namespace base {
-class TaskTraits;
-}
-
 namespace task_scheduler_util {
 
 // Gets a TaskScheduler::InitParams object to initialize TaskScheduler in a
@@ -25,20 +17,6 @@ namespace task_scheduler_util {
 std::unique_ptr<base::TaskScheduler::InitParams>
 GetRendererTaskSchedulerInitParamsFromCommandLine();
 
-// Gets a vector of SchedulerWorkerPoolParams to initialize TaskScheduler in a
-// renderer based off variation params specified on the command line. Returns an
-// empty vector if variation params specified on the command line are incomplete
-// or invalid.
-//
-// Deprecated. https://crbug.com/690706
-std::vector<base::SchedulerWorkerPoolParams> GetRendererWorkerPoolParams();
-
-// Maps |traits| to the index of a renderer worker pool vector provided by
-// GetRendererWorkerPoolParams().
-//
-// Deprecated. https://crbug.com/690706
-size_t RendererWorkerPoolIndexForTraits(const base::TaskTraits& traits);
-
 }  // namespace task_scheduler_util
 
 #endif  // COMPONENTS_TASK_SCHEDULER_UTIL_RENDERER_INITIALIZATION_H_