Revert "[iOS] Using UnifiedConsentService::SetUnifiedConsentGiven() in the settings"

This reverts commit 72bd9335.

Reason for revert: breaks test.

Original change's description:
> [iOS] Using UnifiedConsentService::SetUnifiedConsentGiven() in the settings
> 
> This CL enables unified consent given when the user signs in to Chrome.
> This CL also disabled and enables unified consent given when the user
> toggles the corresponding switch on and off in the Sync and other services
> settings screen.
> 
> Bug: 827072
> Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
> Change-Id: I5384052f4abe117e7816733e45dc4091afe55708
> Reviewed-on: https://chromium-review.googlesource.com/1165151
> Reviewed-by: Thomas Tangl <tangltom@chromium.org>
> Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
> Reviewed-by: Sergio Collazos <sczs@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#581873}

TBR=msarda@chromium.org,jlebel@chromium.org,sczs@chromium.org,tangltom@chromium.org

Change-Id: I057d4085ebfb55e08e7a06d7e0cc0fbdedfaf36c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 827072
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Reviewed-on: https://chromium-review.googlesource.com/1170003Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581907}

ios/chrome/browser/ui/authentication/BUILD.gn

@@ -42,7 +42,6 @@ source_set("authentication") {
     "//components/signin/core/browser",
     "//components/signin/ios/browser",
     "//components/strings",
-    "//components/unified_consent",
     "//google_apis",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",

ios/chrome/browser/ui/authentication/chrome_signin_view_controller.mm

@@ -22,7 +22,6 @@
 #include "components/signin/core/browser/profile_management_switches.h"
 #include "components/signin/core/browser/signin_metrics.h"
 #include "components/strings/grit/components_strings.h"
-#include "components/unified_consent/unified_consent_service.h"
 #import "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
 #include "ios/chrome/browser/signin/account_tracker_service_factory.h"
@@ -46,7 +45,6 @@
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #import "ios/chrome/browser/ui/util/label_link_controller.h"
 #include "ios/chrome/browser/unified_consent/feature.h"
-#include "ios/chrome/browser/unified_consent/unified_consent_service_factory.h"
 #include "ios/chrome/common/string_util.h"
 #include "ios/chrome/grit/ios_chromium_strings.h"
 #include "ios/chrome/grit/ios_strings.h"
@@ -298,14 +296,6 @@ enum AuthenticationState {
 
 - (void)acceptSignInAndCommitSyncChanges {
   DCHECK(_didSignIn);
-  if (_unifiedConsentEnabled) {
-    // The consent has to be given as soon as the user is signed in. Even when
-    // they open the settings through the link.
-    unified_consent::UnifiedConsentService* unifiedConsentService =
-        UnifiedConsentServiceFactory::GetForBrowserState(_browserState);
-    DCHECK(unifiedConsentService);
-    unifiedConsentService->SetUnifiedConsentGiven(true);
-  }
   SyncSetupServiceFactory::GetForBrowserState(_browserState)->CommitChanges();
   [self acceptSignInAndShowAccountsSettings:_unifiedConsentCoordinator
                                                 .settingsLinkWasTapped];

ios/chrome/browser/ui/settings/google_services_settings_coordinator.mm

@@ -16,7 +16,6 @@
 #import "ios/chrome/browser/ui/settings/google_services_settings_local_commands.h"
 #import "ios/chrome/browser/ui/settings/google_services_settings_mediator.h"
 #import "ios/chrome/browser/ui/settings/google_services_settings_view_controller.h"
-#include "ios/chrome/browser/unified_consent/unified_consent_service_factory.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ -51,13 +50,10 @@
       SyncSetupServiceFactory::GetForBrowserState(self.browserState);
   browser_sync::ProfileSyncService* syncService =
       ProfileSyncServiceFactory::GetForBrowserState(self.browserState);
-  unified_consent::UnifiedConsentService* unifiedConsentService =
-      UnifiedConsentServiceFactory::GetForBrowserState(self.browserState);
   self.mediator = [[GoogleServicesSettingsMediator alloc]
-        initWithPrefService:self.browserState->GetPrefs()
-                syncService:syncService
-           syncSetupService:syncSetupService
-      unifiedConsentService:unifiedConsentService];
+      initWithPrefService:self.browserState->GetPrefs()
+              syncService:syncService
+         syncSetupService:syncSetupService];
   self.mediator.consumer = viewController;
   self.mediator.authService =
       AuthenticationServiceFactory::GetForBrowserState(self.browserState);

ios/chrome/browser/ui/settings/google_services_settings_egtest.mm

@@ -98,8 +98,7 @@ using unified_consent::prefs::kUnifiedConsentGiven;
     EARL_GREY_TEST_SKIPPED(@"This test is UIRefresh only.");
   [SigninEarlGreyUI signinWithIdentity:[SigninEarlGreyUtils fakeIdentity1]];
   PrefService* prefService = GetOriginalBrowserState()->GetPrefs();
-  GREYAssert(prefService->GetBoolean(kUnifiedConsentGiven),
-             @"Unified consent should be given");
+  prefService->SetBoolean(kUnifiedConsentGiven, true);
   [self openGoogleServicesSettings];
   [self assertSyncEverythingSection];
   [self assertPersonalizedServicesCollapsed:YES];

ios/chrome/browser/ui/settings/google_services_settings_mediator.h

@@ -20,9 +20,6 @@ class SyncSetupService;
 namespace browser_sync {
 class ProfileSyncService;
 };
-namespace unified_consent {
-class UnifiedConsentService;
-}  // namespace unified_consent
 
 // Mediator for the Google services settings.
 @interface GoogleServicesSettingsMediator
@@ -40,8 +37,6 @@ class UnifiedConsentService;
                         syncService:
                             (browser_sync::ProfileSyncService*)syncService
                    syncSetupService:(SyncSetupService*)syncSetupService
-              unifiedConsentService:
-                  (unified_consent::UnifiedConsentService*)unifiedConsentService
     NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)init NS_UNAVAILABLE;

ios/chrome/browser/ui/settings/google_services_settings_mediator.mm

@@ -11,7 +11,6 @@
 #include "components/prefs/pref_change_registrar.h"
 #include "components/prefs/pref_service.h"
 #include "components/unified_consent/pref_names.h"
-#include "components/unified_consent/unified_consent_service.h"
 #import "ios/chrome/browser/signin/authentication_service.h"
 #import "ios/chrome/browser/signin/authentication_service_factory.h"
 #include "ios/chrome/browser/sync/sync_observer_bridge.h"
@@ -85,9 +84,6 @@ typedef NS_ENUM(NSInteger, ItemType) {
   std::unique_ptr<SyncObserverBridge> _syncObserver;
 }
 
-// Unified consent service.
-@property(nonatomic, assign)
-    unified_consent::UnifiedConsentService* unifiedConsentService;
 // Returns YES if the user is authenticated.
 @property(nonatomic, assign, readonly) BOOL isAuthenticated;
 // Returns YES if the user has given his consent to use Google services.
@@ -120,7 +116,6 @@ typedef NS_ENUM(NSInteger, ItemType) {
 
 @implementation GoogleServicesSettingsMediator
 
-@synthesize unifiedConsentService = _unifiedConsentService;
 @synthesize consumer = _consumer;
 @synthesize authService = _authService;
 @synthesize prefService = _prefService;
@@ -137,21 +132,17 @@ typedef NS_ENUM(NSInteger, ItemType) {
 
 #pragma mark - Load model
 
-- (instancetype)
-  initWithPrefService:(PrefService*)prefService
-          syncService:(browser_sync::ProfileSyncService*)syncService
-     syncSetupService:(SyncSetupService*)syncSetupService
-unifiedConsentService:
-    (unified_consent::UnifiedConsentService*)unifiedConsentService {
+- (instancetype)initWithPrefService:(PrefService*)prefService
+                        syncService:
+                            (browser_sync::ProfileSyncService*)syncService
+                   syncSetupService:(SyncSetupService*)syncSetupService {
   self = [super init];
   if (self) {
     DCHECK(prefService);
     DCHECK(syncService);
     DCHECK(syncSetupService);
-    DCHECK(unifiedConsentService);
     _prefService = prefService;
     _syncSetupService = syncSetupService;
-    _unifiedConsentService = unifiedConsentService;
     _syncObserver.reset(new SyncObserverBridge(self, syncService));
     prefObserverBridge_ = std::make_unique<PrefObserverBridge>(self);
     prefChangeRegistrar_.Init(prefService);
@@ -216,7 +207,7 @@ unifiedConsentService:
 }
 
 - (BOOL)isConsentGiven {
-  return self.unifiedConsentService->IsUnifiedConsentGiven();
+  return self.prefService->GetBoolean(kUnifiedConsentGiven);
 }
 
 - (CollectionViewItem*)syncEverythingItem {
@@ -512,7 +503,7 @@ textItemWithItemType:(NSInteger)itemType
     return;
   // Mark the switch has being animated to avoid being reloaded.
   base::AutoReset<BOOL> autoReset(&_syncEverythingSwitchBeingAnimated, YES);
-  self.unifiedConsentService->SetUnifiedConsentGiven(value);
+  self.prefService->SetBoolean(kUnifiedConsentGiven, value);
 }
 
 - (void)toggleSyncDataSync:(NSInteger)dataTypeInt withValue:(BOOL)value {