Split browser-specific and generic code in components/task_scheduler_util/.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 15d56a6cd11930a7e10dd8f3c12889c31f7608d8..0d4b017bf7bdf809b335ed9a5d2ef6a36ad3342a 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -144,8 +144,7 @@
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/spellcheck/spellcheck_build_features.h"
 #include "components/startup_metric_utils/browser/startup_metric_host_impl.h"
-#include "components/task_scheduler_util/initialization/browser_util.h"
-#include "components/task_scheduler_util/variations/browser_variations_util.h"
+#include "components/task_scheduler_util/browser/initialization.h"
 #include "components/translate/core/common/translate_switches.h"
 #include "components/url_formatter/url_fixer.h"
 #include "components/variations/variations_associated_data.h"
@@ -3336,15 +3335,20 @@ void ChromeContentBrowserClient::GetTaskSchedulerInitializationParams(
   DCHECK(params_vector);
   DCHECK(index_to_traits_callback);
   // If this call fails, content will fall back to the default params.
-  *params_vector =
-      task_scheduler_util::variations::
-          GetBrowserSchedulerWorkerPoolParamsFromVariations();
-  *index_to_traits_callback = base::Bind(&task_scheduler_util::initialization::
-                                             BrowserWorkerPoolIndexForTraits);
+  std::map<std::string, std::string> variation_params;
+  if (variations::GetVariationParams("BrowserScheduler", &variation_params)) {
+    *params_vector =
+        task_scheduler_util::GetBrowserWorkerPoolParams(variation_params);
+    *index_to_traits_callback =
+        base::Bind(&task_scheduler_util::BrowserWorkerPoolIndexForTraits);
+  }
 }
 
 void ChromeContentBrowserClient::
     PerformExperimentalTaskSchedulerRedirections() {
-  task_scheduler_util::variations::
-      MaybePerformBrowserTaskSchedulerRedirection();
+  std::map<std::string, std::string> variation_params;
+  if (variations::GetVariationParams("BrowserScheduler", &variation_params)) {
+    task_scheduler_util::MaybePerformBrowserTaskSchedulerRedirection(
+        variation_params);
+  }
 }