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

chrome/browser/chrome_content_browser_client.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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 126 matching lines @@
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/rappor/public/rappor_utils.h"
 #include "components/rappor/rappor_recorder_impl.h"
 #include "components/rappor/rappor_service_impl.h"
 #include "components/security_interstitials/core/ssl_error_ui.h"
 #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"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_child_process_host.h"
 #include "content/public/browser/browser_main_parts.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/browser_url_handler.h"
 #include "content/public/browser/child_process_data.h"
@@ skipping 3170 matching lines @@
 }
 #endif  // BUILDFLAG(ENABLE_MEDIA_REMOTING)
 
 void ChromeContentBrowserClient::GetTaskSchedulerInitializationParams(
     std::vector<base::SchedulerWorkerPoolParams>* params_vector,
     base::TaskScheduler::WorkerPoolIndexForTraitsCallback*
         index_to_traits_callback) {
   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);
+  }
 }