[iOS] Fixing collapsible sections in Sync and Google Services

When signed out:
  - personalized section should be collapsed
  - non-personalized should be expanded

When signed-in with no consent given:
  - personalized section should be expanded
  - non-personalized should be expanded

When signed-in with consent given:
  - personalized section should be collapsed
  - non-personalized should be collapsed

Bug: 849838, 863860
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I4fa468253606c431684d0c8b19bcf4548dcf4ad7
Reviewed-on: https://chromium-review.googlesource.com/1133171
Commit-Queue: Jérôme Lebel <jlebel@chromium.org>
Reviewed-by: Sergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577477}

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

@@ -141,6 +141,7 @@ source_set("settings") {
     "//components/sync",
     "//components/translate/core/browser",
     "//components/translate/core/common",
+    "//components/unified_consent",
     "//components/url_formatter",
     "//components/version_info",
     "//ios/chrome/app/strings",
@@ -435,10 +436,13 @@ source_set("unified_consent_eg_tests") {
     "//base",
     "//base/test:test_support",
     "//components/signin/core/browser",
+    "//components/unified_consent",
     "//ios/chrome/app/strings:ios_chromium_strings_grit",
     "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/ui:ui_util",
     "//ios/chrome/browser/ui/authentication:eg_test_support",
+    "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
     "//ui/base",
   ]

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

@@ -4,6 +4,7 @@
 
 #import "ios/chrome/browser/ui/settings/google_services_settings_coordinator.h"
 
+#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #import "ios/chrome/browser/signin/authentication_service_factory.h"
 #import "ios/chrome/browser/ui/settings/google_services_settings_mediator.h"
 #import "ios/chrome/browser/ui/settings/google_services_settings_view_controller.h"
@@ -34,7 +35,8 @@
                    style:CollectionViewControllerStyleAppBar];
   controller.presentationDelegate = self;
   self.viewController = controller;
-  self.mediator = [[GoogleServicesSettingsMediator alloc] init];
+  self.mediator = [[GoogleServicesSettingsMediator alloc]
+      initWithPrefService:self.browserState->GetPrefs()];
   self.mediator.consumer = controller;
   self.mediator.authService =
       AuthenticationServiceFactory::GetForBrowserState(self.browserState);

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

@@ -5,9 +5,15 @@
 #import <EarlGrey/EarlGrey.h>
 #import <XCTest/XCTest.h>
 
+#include "components/prefs/pref_service.h"
+#include "components/unified_consent/pref_names.h"
+#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
+#import "ios/chrome/browser/ui/authentication/signin_earl_grey_ui.h"
+#import "ios/chrome/browser/ui/authentication/signin_earlgrey_utils.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #include "ios/chrome/grit/ios_chromium_strings.h"
 #include "ios/chrome/grit/ios_strings.h"
+#import "ios/chrome/test/app/chrome_test_util.h"
 #include "ios/chrome/test/earl_grey/accessibility_util.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey_ui.h"
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
@@ -19,20 +25,22 @@
 #endif
 
 using l10n_util::GetNSString;
+using chrome_test_util::GetOriginalBrowserState;
 using chrome_test_util::GoogleServicesSettingsButton;
 using chrome_test_util::SettingsMenuBackButton;
 using chrome_test_util::SettingsDoneButton;
+using unified_consent::prefs::kUnifiedConsentGiven;
 
 // Integration tests using the Google services settings screen.
 @interface GoogleServicesSettingsTestCase : ChromeTestCase
 
-@property(nonatomic, strong) id<GREYMatcher> scollViewMatcher;
+@property(nonatomic, strong) id<GREYMatcher> scrollViewMatcher;
 
 @end
 
 @implementation GoogleServicesSettingsTestCase
 
-@synthesize scollViewMatcher = _scollViewMatcher;
+@synthesize scrollViewMatcher = _scrollViewMatcher;
 
 // Opens the Google services settings view, and closes it.
 - (void)testOpenGoogleServicesSettings {
@@ -41,9 +49,7 @@ using chrome_test_util::SettingsDoneButton;
   [self openGoogleServicesSettings];
 
   // Assert title and accessibility.
-  [[EarlGrey
-      selectElementWithMatcher:grey_accessibilityID(
-                                   @"google_services_settings_view_controller")]
+  [[EarlGrey selectElementWithMatcher:self.scrollViewMatcher]
       assertWithMatcher:grey_notNil()];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
 
@@ -54,18 +60,75 @@ using chrome_test_util::SettingsDoneButton;
       performAction:grey_tap()];
 }
 
-// Tests if the Google Services settings contains only the non personalized
-// options when the user is not logged in.
-- (void)testServicesWhileSignedOut {
-  // TODO(crbug.com/863860): re-enable when fixed.
-  if (!IsIPadIdiom())
-    EARL_GREY_TEST_DISABLED(@"Fails on iPhones.");
+// Tests the Google Services settings, when the user is not logged in.
+// The personalized section is expect to be collapsed and the non-personalized
+// section is expected to be expanded.
+- (void)testOpeningServicesWhileSignedOut {
+  if (!IsUIRefreshPhase1Enabled())
+    EARL_GREY_TEST_SKIPPED(@"This test is UIRefresh only.");
+  [self openGoogleServicesSettings];
+  [self assertPersonalizedServicesCollapsed:YES];
+  [self assertNonPersonalizedServicesCollapsed:NO];
+}
 
+// Tests the Google Services settings, when the user is logged in without user
+// consent.
+// The "Sync Everything" section is expected to be visible.
+// The personalized section and the non-personalized section are expected to be
+// expanded.
+- (void)testOpeningServicesWhileSignedIn {
   if (!IsUIRefreshPhase1Enabled())
     EARL_GREY_TEST_SKIPPED(@"This test is UIRefresh only.");
+  PrefService* prefService = GetOriginalBrowserState()->GetPrefs();
+  prefService->SetBoolean(kUnifiedConsentGiven, false);
+  [SigninEarlGreyUI signinWithIdentity:[SigninEarlGreyUtils fakeIdentity1]];
   [self openGoogleServicesSettings];
-  [self assertSyncPersonalizedServicesCollapsed:YES];
+  [self assertSyncEverythingSection];
+  [self assertPersonalizedServicesCollapsed:NO];
   [self assertNonPersonalizedServicesCollapsed:NO];
+}
+
+// Tests the Google Services settings, when the user is logged in with user
+// consent.
+// The "Sync Everything" section is expected to be visible.
+// The personalized section and the non-personalized section are expected to be
+// collapsed.
+- (void)testOpeningServicesWhileSignedInAndConsentGiven {
+  if (!IsUIRefreshPhase1Enabled())
+    EARL_GREY_TEST_SKIPPED(@"This test is UIRefresh only.");
+  PrefService* prefService = GetOriginalBrowserState()->GetPrefs();
+  prefService->SetBoolean(kUnifiedConsentGiven, true);
+  [SigninEarlGreyUI signinWithIdentity:[SigninEarlGreyUtils fakeIdentity1]];
+  [self openGoogleServicesSettings];
+  [self assertSyncEverythingSection];
+  [self assertPersonalizedServicesCollapsed:YES];
+  [self assertNonPersonalizedServicesCollapsed:YES];
+}
+
+// Tests to expand/collapse the personalized section.
+- (void)testTogglePersonalizedServices {
+  if (!IsUIRefreshPhase1Enabled())
+    EARL_GREY_TEST_SKIPPED(@"This test is UIRefresh only.");
+  [self openGoogleServicesSettings];
+  [self assertPersonalizedServicesCollapsed:YES];
+  [self togglePersonalizedServicesSection];
+  [self assertPersonalizedServicesCollapsed:NO];
+  [[EarlGrey selectElementWithMatcher:self.scrollViewMatcher]
+      performAction:grey_scrollToContentEdgeWithStartPoint(kGREYContentEdgeTop,
+                                                           0.1f, 0.1f)];
+  [self togglePersonalizedServicesSection];
+  [self assertPersonalizedServicesCollapsed:YES];
+}
+
+// Tests to expand/collapse the non-personalized section.
+- (void)testToggleNonPersonalizedServices {
+  if (!IsUIRefreshPhase1Enabled())
+    EARL_GREY_TEST_SKIPPED(@"This test is UIRefresh only.");
+  [self openGoogleServicesSettings];
+  [self assertNonPersonalizedServicesCollapsed:NO];
+  [[EarlGrey selectElementWithMatcher:self.scrollViewMatcher]
+      performAction:grey_scrollToContentEdgeWithStartPoint(kGREYContentEdgeTop,
+                                                           0.1f, 0.1f)];
   [self toggleNonPersonalizedServicesSection];
   [self assertNonPersonalizedServicesCollapsed:YES];
   [self toggleNonPersonalizedServicesSection];
@@ -77,12 +140,20 @@ using chrome_test_util::SettingsDoneButton;
 - (void)openGoogleServicesSettings {
   [ChromeEarlGreyUI openSettingsMenu];
   [ChromeEarlGreyUI tapSettingsMenuButton:GoogleServicesSettingsButton()];
-  self.scollViewMatcher =
+  self.scrollViewMatcher =
       grey_accessibilityID(@"google_services_settings_view_controller");
-  [[EarlGrey selectElementWithMatcher:self.scollViewMatcher]
+  [[EarlGrey selectElementWithMatcher:self.scrollViewMatcher]
       assertWithMatcher:grey_notNil()];
 }
 
+- (void)togglePersonalizedServicesSection {
+  [[EarlGrey
+      selectElementWithMatcher:
+          grey_accessibilityLabel(GetNSString(
+              IDS_IOS_GOOGLE_SERVICES_SETTINGS_SYNC_PERSONALIZATION_TEXT))]
+      performAction:grey_tap()];
+}
+
 - (void)toggleNonPersonalizedServicesSection {
   [[EarlGrey
       selectElementWithMatcher:
@@ -92,18 +163,21 @@ using chrome_test_util::SettingsDoneButton;
 }
 
 - (void)assertCellWithTitleID:(int)titleID detailTextID:(int)detailTextID {
+  NSString* accessibilityLabel = GetNSString(titleID);
+  if (detailTextID) {
+    accessibilityLabel =
+        [NSString stringWithFormat:@"%@, %@", accessibilityLabel,
+                                   GetNSString(detailTextID)];
+  }
   [[[EarlGrey
-      selectElementWithMatcher:grey_accessibilityLabel(GetNSString(titleID))]
+      selectElementWithMatcher:grey_allOf(
+                                   grey_accessibilityLabel(accessibilityLabel),
+                                   grey_kindOfClass(
+                                       [UICollectionViewCell class]),
+                                   grey_sufficientlyVisible(), nil)]
          usingSearchAction:grey_swipeSlowInDirection(kGREYDirectionUp)
-      onElementWithMatcher:self.scollViewMatcher]
+      onElementWithMatcher:self.scrollViewMatcher]
       assertWithMatcher:grey_notNil()];
-  if (detailTextID) {
-    [[[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(
-                                             GetNSString(detailTextID))]
-           usingSearchAction:grey_swipeSlowInDirection(kGREYDirectionUp)
-        onElementWithMatcher:self.scollViewMatcher]
-        assertWithMatcher:grey_notNil()];
-  }
 }
 
 - (void)assertSyncEverythingSection {
@@ -111,7 +185,7 @@ using chrome_test_util::SettingsDoneButton;
                  detailTextID:0];
 }
 
-- (void)assertSyncPersonalizedServicesCollapsed:(BOOL)collapsed {
+- (void)assertPersonalizedServicesCollapsed:(BOOL)collapsed {
   [self
       assertCellWithTitleID:
           IDS_IOS_GOOGLE_SERVICES_SETTINGS_SYNC_PERSONALIZATION_TEXT

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

@@ -13,11 +13,18 @@
 
 class AuthenticationService;
 @class GoogleServicesSettingsViewController;
+class PrefService;
 
 // Mediator for the Google services settings.
 @interface GoogleServicesSettingsMediator
     : NSObject<GoogleServicesSettingsViewControllerModelDelegate>
 
+// Designated initializer. |prefService| should not be null.
+- (instancetype)initWithPrefService:(PrefService*)prefService
+    NS_DESIGNATED_INITIALIZER;
+
+- (instancetype)init NS_UNAVAILABLE;
+
 // View controller.
 @property(nonatomic, weak) id<GoogleServicesSettingsConsumer> consumer;
 // Browser state.

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

@@ -4,6 +4,8 @@
 
 #import "ios/chrome/browser/ui/settings/google_services_settings_mediator.h"
 
+#include "components/prefs/pref_service.h"
+#include "components/unified_consent/pref_names.h"
 #import "ios/chrome/browser/signin/authentication_service.h"
 #import "ios/chrome/browser/signin/authentication_service_factory.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
@@ -20,6 +22,7 @@
 #endif
 
 using l10n_util::GetNSString;
+using unified_consent::prefs::kUnifiedConsentGiven;
 
 namespace {
 
@@ -67,6 +70,8 @@ typedef NS_ENUM(NSInteger, ItemType) {
 
 // Returns YES if the user is authenticated.
 @property(nonatomic, readonly) BOOL isAuthenticated;
+// Preference service.
+@property(nonatomic, readonly) PrefService* prefService;
 
 @end
 
@@ -74,9 +79,19 @@ typedef NS_ENUM(NSInteger, ItemType) {
 
 @synthesize consumer = _consumer;
 @synthesize authService = _authService;
+@synthesize prefService = _prefService;
 
 #pragma mark - Load model
 
+- (instancetype)initWithPrefService:(PrefService*)prefService {
+  self = [super init];
+  if (self) {
+    DCHECK(prefService);
+    _prefService = prefService;
+  }
+  return self;
+}
+
 // Loads SyncEverythingSectionIdentifier section.
 - (void)loadSyncEverythingSection {
   CollectionViewModel* model = self.consumer.collectionViewModel;
@@ -91,6 +106,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
       [[SyncSwitchItem alloc] initWithType:SyncEverythingItemType];
   item.text = GetNSString(IDS_IOS_GOOGLE_SERVICES_SETTINGS_SYNC_EVERYTHING);
   item.enabled = YES;
+  item.on = [self isConsentGiven];
   return item;
 }
 
@@ -102,10 +118,11 @@ typedef NS_ENUM(NSInteger, ItemType) {
                  collapsedKey:kGoogleServicesSettingsPersonalizedSectionKey];
   SettingsCollapsibleItem* syncPersonalizationItem =
       [self syncPersonalizationItem];
-  syncPersonalizationItem.collapsed =
-      [model sectionIsCollapsed:PersonalizedSectionIdentifier];
   [model addItem:syncPersonalizationItem
       toSectionWithIdentifier:PersonalizedSectionIdentifier];
+  BOOL collapsed = self.isAuthenticated ? [self isConsentGiven] : YES;
+  syncPersonalizationItem.collapsed = collapsed;
+  [model setSection:PersonalizedSectionIdentifier collapsed:collapsed];
   [model addItem:[self syncBookmarksItem]
       toSectionWithIdentifier:PersonalizedSectionIdentifier];
   [model addItem:[self syncHistoryItem]
@@ -126,8 +143,6 @@ typedef NS_ENUM(NSInteger, ItemType) {
       toSectionWithIdentifier:PersonalizedSectionIdentifier];
   [model addItem:[self manageSyncedDataItem]
       toSectionWithIdentifier:PersonalizedSectionIdentifier];
-  [model setSection:PersonalizedSectionIdentifier
-          collapsed:!self.isAuthenticated];
 }
 
 // Creates SyncPersonalizationItemType item.
@@ -260,10 +275,11 @@ typedef NS_ENUM(NSInteger, ItemType) {
                  collapsedKey:kGoogleServicesSettingsNonPersonalizedSectionKey];
   SettingsCollapsibleItem* nonPersonalizedServicesItem =
       [self nonPersonalizedServicesItem];
-  nonPersonalizedServicesItem.collapsed =
-      [model sectionIsCollapsed:NonPersonalizedSectionIdentifier];
   [model addItem:nonPersonalizedServicesItem
       toSectionWithIdentifier:NonPersonalizedSectionIdentifier];
+  BOOL collapsed = self.isAuthenticated ? [self isConsentGiven] : NO;
+  nonPersonalizedServicesItem.collapsed = collapsed;
+  [model setSection:NonPersonalizedSectionIdentifier collapsed:collapsed];
   [model addItem:[self autocompleteSearchesAndURLsItem]
       toSectionWithIdentifier:NonPersonalizedSectionIdentifier];
   [model addItem:[self preloadPagesItem]
@@ -272,7 +288,6 @@ typedef NS_ENUM(NSInteger, ItemType) {
       toSectionWithIdentifier:NonPersonalizedSectionIdentifier];
   [model addItem:[self betterSearchAndBrowsingItemType]
       toSectionWithIdentifier:NonPersonalizedSectionIdentifier];
-  [model setSection:PersonalizedSectionIdentifier collapsed:YES];
 }
 
 // Creates NonPersonalizedServicesItemType item.
@@ -340,6 +355,10 @@ typedef NS_ENUM(NSInteger, ItemType) {
   return self.authService->IsAuthenticated();
 }
 
+- (BOOL)isConsentGiven {
+  return self.prefService->GetBoolean(kUnifiedConsentGiven);
+}
+
 #pragma mark - GoogleServicesSettingsViewControllerModelDelegate
 
 - (void)googleServicesSettingsViewControllerLoadModel: