[iOS] Adding user event data type into SyncSetupService

Adding user event data type to sync on iOS. Available only if unified
consent is enabled.

Bug: 827072
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Ib8c01a40dd10e2aa61df65cad9ddfa6bb8881774
Reviewed-on: https://chromium-review.googlesource.com/1150140
Commit-Queue: Jérôme Lebel <jlebel@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578344}

ios/chrome/browser/sync/BUILD.gn

@@ -72,6 +72,7 @@ source_set("sync") {
     "//ios/chrome/browser/sync/sessions",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/undo",
+    "//ios/chrome/browser/unified_consent:feature",
     "//ios/chrome/common",
     "//ios/web",
     "//net",

ios/chrome/browser/sync/sync_setup_service.cc

@@ -15,15 +15,16 @@
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/pref_names.h"
+#include "ios/chrome/browser/unified_consent/feature.h"
 #include "net/base/network_change_notifier.h"
 
 namespace {
 // The set of user-selectable datatypes. This must be in the same order as
 // |SyncSetupService::SyncableDatatype|.
 syncer::ModelType kDataTypes[] = {
-    syncer::BOOKMARKS,    syncer::TYPED_URLS, syncer::PASSWORDS,
-    syncer::PROXY_TABS,   syncer::AUTOFILL,   syncer::PREFERENCES,
-    syncer::READING_LIST,
+    syncer::BOOKMARKS,    syncer::TYPED_URLS,  syncer::PASSWORDS,
+    syncer::PROXY_TABS,   syncer::AUTOFILL,    syncer::PREFERENCES,
+    syncer::READING_LIST, syncer::USER_EVENTS,
 };
 }  // namespace
 
@@ -33,6 +34,8 @@ SyncSetupService::SyncSetupService(syncer::SyncService* sync_service,
   DCHECK(sync_service_);
   DCHECK(prefs_);
   for (unsigned int i = 0; i < arraysize(kDataTypes); ++i) {
+    if (kDataTypes[i] == syncer::USER_EVENTS && !IsUnifiedConsentEnabled())
+      continue;
     user_selectable_types_.Put(kDataTypes[i]);
   }
 }

ios/chrome/browser/sync/sync_setup_service.h

@@ -45,6 +45,7 @@ class SyncSetupService : public KeyedService {
     kSyncAutofill,
     kSyncPreferences,
     kSyncReadingList,
+    kSyncUserEvent,
     kNumberOfSyncableDatatypes
   };
 

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

@@ -59,6 +59,7 @@ source_set("authentication") {
     "//ios/chrome/browser/ui/signin_interaction/public",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/unified_consent",
+    "//ios/chrome/browser/unified_consent:feature",
     "//ios/chrome/common",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/images",

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

@@ -188,6 +188,7 @@ source_set("settings") {
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells/resources:table_view_cell_check_mark",
     "//ios/chrome/browser/unified_consent",
+    "//ios/chrome/browser/unified_consent:feature",
     "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web:web",
     "//ios/chrome/common",
@@ -334,6 +335,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/settings/sync_utils",
+    "//ios/chrome/browser/unified_consent:feature",
     "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:test_support",

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

@@ -332,6 +332,10 @@ typedef NS_ENUM(NSInteger, ItemType) {
   for (int i = 0; i < SyncSetupService::kNumberOfSyncableDatatypes; ++i) {
     SyncSetupService::SyncableDatatype dataType =
         static_cast<SyncSetupService::SyncableDatatype>(i);
+    if (dataType == SyncSetupService::kSyncUserEvent) {
+      // This data type should only be used with the unified consent UI.
+      continue;
+    }
     [model addItem:[self switchItemForDataType:dataType]
         toSectionWithIdentifier:SectionIdentifierSyncServices];
   }
@@ -829,16 +833,21 @@ typedef NS_ENUM(NSInteger, ItemType) {
 
   // Syncable data types cells
   NSMutableArray* switchsToReconfigure = [[NSMutableArray alloc] init];
-  for (NSUInteger index = 0;
+  for (NSInteger index = 0;
        index < SyncSetupService::kNumberOfSyncableDatatypes; ++index) {
+    SyncSetupService::SyncableDatatype dataType =
+        static_cast<SyncSetupService::SyncableDatatype>(index);
+    if (dataType == SyncSetupService::kSyncUserEvent) {
+      // This data type should only be used with the unified consent UI.
+      continue;
+    }
     NSIndexPath* indexPath = [self.collectionViewModel
         indexPathForItemType:ItemTypeSyncableDataType
            sectionIdentifier:SectionIdentifierSyncServices
                      atIndex:index];
     SyncSwitchItem* syncSwitchItem = base::mac::ObjCCastStrict<SyncSwitchItem>(
         [self.collectionViewModel itemAtIndexPath:indexPath]);
-    SyncSetupService::SyncableDatatype dataType =
-        (SyncSetupService::SyncableDatatype)syncSwitchItem.dataType;
+    DCHECK_EQ(index, syncSwitchItem.dataType);
     syncer::ModelType modelType = _syncSetupService->GetModelType(dataType);
     syncSwitchItem.on = _syncSetupService->IsDataTypePreferred(modelType);
     syncSwitchItem.enabled = [self shouldSyncableItemsBeEnabled];
@@ -967,6 +976,8 @@ typedef NS_ENUM(NSInteger, ItemType) {
       return IDS_SYNC_DATATYPE_PREFERENCES;
     case SyncSetupService::kSyncReadingList:
       return IDS_SYNC_DATATYPE_READING_LIST;
+    case SyncSetupService::kSyncUserEvent:
+    // Not supported for the code before the unified consent.
     case SyncSetupService::kNumberOfSyncableDatatypes:
       NOTREACHED();
   }

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

@@ -28,6 +28,7 @@
 #import "ios/chrome/browser/ui/settings/cells/sync_switch_item.h"
 #import "ios/chrome/browser/ui/settings/cells/text_and_error_item.h"
 #import "ios/chrome/browser/ui/settings/sync_utils/sync_util.h"
+#include "ios/chrome/browser/unified_consent/feature.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/web/public/test/test_web_thread_bundle.h"
 #import "testing/gtest_mac.h"
@@ -240,9 +241,11 @@ TEST_F(SyncSettingsCollectionViewControllerTest, TestModel) {
   EXPECT_EQ(3, NumberOfSections());
 
   EXPECT_EQ(1, NumberOfItemsInSection(0));
-  // One extra item for "Sync Everything" and one for Autofill wallet import.
-  int expected_number_of_items =
-      SyncSetupService::kNumberOfSyncableDatatypes + 2;
+  // There is one item per data type, except for unified consent that is
+  // unsupported by the old UI. In addition, there are two extra items, one
+  // for "Sync Everything" and another for Autofill wallet import.
+  constexpr int expected_number_of_items =
+      SyncSetupService::kNumberOfSyncableDatatypes - 1 + 2;
   EXPECT_EQ(expected_number_of_items, NumberOfItemsInSection(1));
   EXPECT_EQ(2, NumberOfItemsInSection(2));
 
@@ -263,6 +266,10 @@ TEST_F(SyncSettingsCollectionViewControllerTest, TestModel) {
   for (int i = 0; i < SyncSetupService::kNumberOfSyncableDatatypes; i++) {
     SyncSetupService::SyncableDatatype dataType =
         static_cast<SyncSetupService::SyncableDatatype>(i);
+    if (dataType == SyncSetupService::kSyncUserEvent) {
+      // Old UI without unified consent doesn't support user event data type.
+      continue;
+    }
     SyncSwitchItem* syncDataTypeItem = GetCollectionViewItem(1, item++);
     EXPECT_NSEQ(syncDataTypeItem.text,
                 l10n_util::GetNSString(

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

@@ -22,6 +22,7 @@ source_set("signin_interaction") {
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/unified_consent",
+    "//ios/chrome/browser/unified_consent:feature",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin",
   ]

ios/chrome/browser/unified_consent/BUILD.gn

@@ -5,14 +5,13 @@
 source_set("unified_consent") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "feature.cc",
-    "feature.h",
     "unified_consent_service_client_impl.cc",
     "unified_consent_service_client_impl.h",
     "unified_consent_service_factory.cc",
     "unified_consent_service_factory.h",
   ]
   deps = [
+    ":feature",
     "//components/browser_sync",
     "//components/keyed_service/ios",
     "//components/metrics",
@@ -25,3 +24,14 @@ source_set("unified_consent") {
     "//ios/chrome/browser/sync",
   ]
 }
+
+source_set("feature") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "feature.cc",
+    "feature.h",
+  ]
+  deps = [
+    "//components/unified_consent",
+  ]
+}