[unified-consent] Move IsUnifiedConsentFeatureEnabled to components/unified_consent.

Unified Consent feature is no longer dependent on Desktop Identity Consistency being
enabled. This means that the Unified Consent feature is no longer a per-profile feature.

This CL removes the argument profile from IsUnifiedConsentFeatureEnabled and
IsUnifiedConsentFeatureWithBumpEnabled and moves these functions in the unified
consent component.

Bug: 873064
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: Ifc338dbcb48500bc17d52bf5bcf52a45ea46860d
Reviewed-on: https://chromium-review.googlesource.com/1202702
Commit-Queue: Mihai Sardarescu <[email protected]>
Reviewed-by: Steven Holte <[email protected]>
Reviewed-by: Jochen Eisinger <[email protected]>
Reviewed-by: David Roger <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#588891}
Reviewed-on: https://chromium-review.googlesource.com/1209362
Reviewed-by: Mihai Sardarescu <[email protected]>
Cr-Commit-Position: refs/branch-heads/3538@{#85}
Cr-Branched-From: 79f7c91-refs/heads/master@{#587811}

Author: Mihai Sardarescu

chrome/browser/BUILD.gn

@@ -1435,8 +1435,6 @@ jumbo_split_static_library("browser") {
     "signin/signin_tracker_factory.h",
     "signin/signin_util.cc",
     "signin/signin_util.h",
-    "signin/unified_consent_helper.cc",
-    "signin/unified_consent_helper.h",
     "site_details.cc",
     "site_details.h",
     "speech/chrome_speech_recognition_manager_delegate.cc",

chrome/browser/android/contextualsearch/contextual_search_delegate.cc

@@ -20,7 +20,6 @@
 #include "chrome/browser/language/language_model_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/signin/unified_consent_helper.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/translate/translate_service.h"
 #include "chrome/common/pref_names.h"
@@ -392,7 +391,6 @@ bool ContextualSearchDelegate::CanSendPageURL(
       anonymized_unified_consent_url_helper =
           UrlKeyedDataCollectionConsentHelper::
               NewAnonymizedDataCollectionConsentHelper(
-                  IsUnifiedConsentFeatureEnabled(profile),
                   ProfileManager::GetActiveUserProfile()->GetPrefs(),
                   sync_service);
   // If they have, then allow sending of the URL.

chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc

@@ -25,7 +25,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
-#include "chrome/browser/signin/unified_consent_helper.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
@@ -92,7 +91,6 @@ ChromeAutocompleteProviderClient::ChromeAutocompleteProviderClient(
       url_consent_helper_(
           unified_consent::UrlKeyedDataCollectionConsentHelper::
               NewPersonalizedDataCollectionConsentHelper(
-                  IsUnifiedConsentFeatureEnabled(profile_),
                   ProfileSyncServiceFactory::GetSyncServiceForBrowserContext(
                       profile_))),
       storage_partition_(nullptr) {}

chrome/browser/metrics/chrome_metrics_service_client.cc

@@ -46,7 +46,6 @@
 #include "chrome/browser/metrics/subprocess_metrics_provider.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/certificate_reporting_metrics_provider.h"
-#include "chrome/browser/signin/unified_consent_helper.h"
 #include "chrome/browser/sync/chrome_sync_client.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/translate/translate_ranker_metrics_provider.h"
@@ -922,8 +921,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEvents(Profile* profile) {
   if (!sync) {
     return false;
   }
-  ObserveServiceForSyncDisables(sync, profile->GetPrefs(),
-                                IsUnifiedConsentFeatureEnabled(profile));
+  ObserveServiceForSyncDisables(sync, profile->GetPrefs());
   return true;
 }
 

chrome/browser/metrics/ukm_browsertest.cc

@@ -16,7 +16,6 @@
 #include "chrome/browser/metrics/chrome_metrics_services_manager_client.h"
 #include "chrome/browser/metrics/testing/metrics_reporting_pref_helper.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/signin/unified_consent_helper.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/single_client_status_change_checker.h"
@@ -33,6 +32,7 @@
 #include "components/sync/test/fake_server/fake_server_network_resources.h"
 #include "components/ukm/content/source_url_recorder.h"
 #include "components/ukm/ukm_service.h"
+#include "components/unified_consent/feature.h"
 #include "components/unified_consent/scoped_unified_consent.h"
 #include "components/variations/service/variations_field_trial_creator.h"
 #include "components/version_info/version_info.h"
@@ -583,7 +583,7 @@ IN_PROC_BROWSER_TEST_P(UkmBrowserTest, SingleDisableHistorySyncCheck) {
   EXPECT_NE(0U, original_client_id);
 
   harness->DisableSyncForDatatype(syncer::TYPED_URLS);
-  if (IsUnifiedConsentFeatureEnabled(profile)) {
+  if (unified_consent::IsUnifiedConsentFeatureEnabled()) {
     // Disable history sync does not disable UKM when unified consent is
     // enabled.
     EXPECT_TRUE(ukm_enabled());
@@ -621,7 +621,7 @@ IN_PROC_BROWSER_TEST_P(UkmBrowserTest, MultiDisableHistorySyncCheck) {
   EXPECT_EQ(original_client_id, client_id());
 
   harness2->DisableSyncForDatatype(syncer::TYPED_URLS);
-  if (IsUnifiedConsentFeatureEnabled(profile2)) {
+  if (unified_consent::IsUnifiedConsentFeatureEnabled()) {
     // Disable history sync does not disable UKM when unified consent is
     // enabled.
     EXPECT_TRUE(ukm_enabled());

chrome/browser/ntp_snippets/contextual_content_suggestions_service_factory.cc

@@ -13,7 +13,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/suggestions/image_decoder_impl.h"
-#include "chrome/browser/signin/unified_consent_helper.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "components/image_fetcher/core/image_decoder.h"
 #include "components/image_fetcher/core/image_fetcher.h"
@@ -27,6 +26,7 @@
 #include "components/ntp_snippets/remote/cached_image_fetcher.h"
 #include "components/ntp_snippets/remote/remote_suggestions_database.h"
 #include "components/prefs/pref_service.h"
+#include "components/unified_consent/feature.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/service_manager_connection.h"
@@ -103,10 +103,9 @@ ContextualContentSuggestionsServiceFactory::BuildServiceInstanceFor(
       content::BrowserContext::GetDefaultStoragePartition(context);
   std::unique_ptr<unified_consent::UrlKeyedDataCollectionConsentHelper>
       consent_helper;
-  if (IsUnifiedConsentFeatureEnabled(profile)) {
+  if (unified_consent::IsUnifiedConsentFeatureEnabled()) {
     consent_helper = unified_consent::UrlKeyedDataCollectionConsentHelper::
         NewPersonalizedDataCollectionConsentHelper(
-            true, /*is_unified_consent_enabled*/
             ProfileSyncServiceFactory::GetSyncServiceForBrowserContext(
                 profile));
   }

chrome/browser/signin/unified_consent_helper.cc

@@ -20,7 +20,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/signin/unified_consent_helper.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/common/channel_info.h"
@@ -366,18 +365,15 @@ jboolean ProfileSyncServiceAndroid::IsUrlKeyedDataCollectionEnabled(
     const base::android::JavaParamRef<jobject>& obj,
     jboolean personalized) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  bool is_unified_consent_enabled = IsUnifiedConsentFeatureEnabled(profile_);
   std::unique_ptr<UrlKeyedDataCollectionConsentHelper>
       unified_consent_url_helper;
   if (personalized) {
     unified_consent_url_helper = UrlKeyedDataCollectionConsentHelper::
-        NewPersonalizedDataCollectionConsentHelper(is_unified_consent_enabled,
-                                                   sync_service_);
+        NewPersonalizedDataCollectionConsentHelper(sync_service_);
   } else {
     PrefService* pref_service = profile_->GetPrefs();
     unified_consent_url_helper = UrlKeyedDataCollectionConsentHelper::
-        NewAnonymizedDataCollectionConsentHelper(is_unified_consent_enabled,
-                                                 pref_service, sync_service_);
+        NewAnonymizedDataCollectionConsentHelper(pref_service, sync_service_);
   }
 
   return unified_consent_url_helper->IsEnabled();