Commit 713a74a5 authored by Jérôme Lebel's avatar Jérôme Lebel Committed by Commit Bot

[iOS] Removing pre unified consent code in UnifiedConsentServiceFactory

Unified consent feature flag is always on.

Bug: 951313
Change-Id: I2c80c83039c628a88781f80979c7e20dd9a1412f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1798602
Auto-Submit: Jérôme Lebel <jlebel@chromium.org>
Commit-Queue: Thomas Tangl <tangltom@chromium.org>
Reviewed-by: default avatarThomas Tangl <tangltom@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695651}
parent 968bf862
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "components/keyed_service/ios/browser_state_dependency_manager.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h"
#include "components/sync/driver/sync_service.h" #include "components/sync/driver/sync_service.h"
#include "components/sync_preferences/pref_service_syncable.h" #include "components/sync_preferences/pref_service_syncable.h"
#include "components/unified_consent/feature.h"
#include "components/unified_consent/unified_consent_metrics.h" #include "components/unified_consent/unified_consent_metrics.h"
#include "components/unified_consent/unified_consent_service.h" #include "components/unified_consent/unified_consent_service.h"
#include "ios/chrome/browser/application_context.h" #include "ios/chrome/browser/application_context.h"
...@@ -67,12 +66,6 @@ UnifiedConsentServiceFactory::BuildServiceInstanceFor( ...@@ -67,12 +66,6 @@ UnifiedConsentServiceFactory::BuildServiceInstanceFor(
// Record settings for pre- and post-UnifiedConsent users. // Record settings for pre- and post-UnifiedConsent users.
unified_consent::metrics::RecordSettingsHistogram(user_pref_service); unified_consent::metrics::RecordSettingsHistogram(user_pref_service);
if (!unified_consent::IsUnifiedConsentFeatureEnabled()) {
unified_consent::UnifiedConsentService::RollbackIfNeeded(user_pref_service,
sync_service);
return nullptr;
}
// List of synced prefs that can be configured during the settings opt-in // List of synced prefs that can be configured during the settings opt-in
// flow. // flow.
std::vector<std::string> synced_service_pref_names; std::vector<std::string> synced_service_pref_names;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment