[unified-consent] Enable Unified Consent in fieldtrial_testing_config

Bug: 811351
Change-Id: Id46b66bef4483cf2e34a42771fca6838109673ef
Reviewed-on: https://chromium-review.googlesource.com/1225987
Commit-Queue: Thomas Tangl <tangltom@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Reviewed-by: Markus Heintz <markusheintz@chromium.org>
Reviewed-by: Robert Kaplow (sloooow) <rkaplow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593505}

chrome/browser/about_flags.cc

@@ -3805,7 +3805,7 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kUnifiedConsentDescription, kOsAll,
      FEATURE_WITH_PARAMS_VALUE_TYPE(unified_consent::kUnifiedConsent,
                                     kUnifiedConsentVariations,
-                                    "UnifiedConsentVariations")},
+                                    "UnifiedConsent")},
 
     {"force-unified-consent-bump",
      flag_descriptions::kForceUnifiedConsentBumpName,

chrome/browser/browsing_data/counters/sync_aware_counter_browsertest.cc

@@ -9,8 +9,10 @@
 #include "chrome/browser/history/web_history_service_factory.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/unified_consent/unified_consent_service_factory.h"
 #include "chrome/browser/web_data_service_factory.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
@@ -23,6 +25,7 @@
 #include "components/history/core/browser/web_history_service.h"
 #include "components/history/core/test/fake_web_history_service.h"
 #include "components/prefs/pref_service.h"
+#include "components/unified_consent/unified_consent_service.h"
 #include "content/public/browser/browser_thread.h"
 
 using browsing_data::BrowsingDataCounter;
@@ -116,6 +119,20 @@ IN_PROC_BROWSER_TEST_F(SyncAwareCounterTest, AutofillCounter) {
   WaitForCounting();
   EXPECT_TRUE(IsSyncEnabled());
 
+  // When the unified consent was given, it needs to be revoked here before
+  // the sync_everything flag can be set to false below. This restarts the
+  // counter.
+  unified_consent::UnifiedConsentService* consent_service =
+      UnifiedConsentServiceFactory::GetForProfile(profile);
+  if (consent_service && consent_service->IsUnifiedConsentGiven()) {
+    consent_service->SetUnifiedConsentGiven(false);
+    ASSERT_TRUE(
+        GetClient(kFirstProfileIndex)
+            ->AwaitSyncSetupCompletion(/*skip_passphrase_verification=*/false));
+    WaitForCounting();
+    ASSERT_TRUE(sync_service->GetActiveDataTypes().Has(syncer::AUTOFILL));
+  }
+
   // We stop syncing autofill in particular. This restarts the counter.
   syncer::ModelTypeSet everything_except_autofill =
       syncer::UserSelectableTypes();
@@ -178,6 +195,20 @@ IN_PROC_BROWSER_TEST_F(SyncAwareCounterTest, PasswordCounter) {
   WaitForCounting();
   EXPECT_TRUE(IsSyncEnabled());
 
+  // When the unified consent was given, it needs to be revoked here before
+  // the sync_everything flag can be set to false below. This restarts the
+  // counter.
+  unified_consent::UnifiedConsentService* consent_service =
+      UnifiedConsentServiceFactory::GetForProfile(profile);
+  if (consent_service && consent_service->IsUnifiedConsentGiven()) {
+    consent_service->SetUnifiedConsentGiven(false);
+    ASSERT_TRUE(
+        GetClient(kFirstProfileIndex)
+            ->AwaitSyncSetupCompletion(/*skip_passphrase_verification=*/false));
+    WaitForCounting();
+    ASSERT_TRUE(sync_service->GetPreferredDataTypes().Has(syncer::PASSWORDS));
+  }
+
   // We stop syncing passwords in particular. This restarts the counter.
   syncer::ModelTypeSet everything_except_passwords =
       syncer::UserSelectableTypes();
@@ -248,6 +279,21 @@ IN_PROC_BROWSER_TEST_F(SyncAwareCounterTest, HistoryCounter) {
   WaitForCounting();
   EXPECT_TRUE(IsSyncEnabled());
 
+  // When the unified consent was given, it needs to be revoked here before
+  // the sync_everything flag can be set to false below. This restarts the
+  // counter.
+  unified_consent::UnifiedConsentService* consent_service =
+      UnifiedConsentServiceFactory::GetForProfile(profile);
+  if (consent_service && consent_service->IsUnifiedConsentGiven()) {
+    consent_service->SetUnifiedConsentGiven(false);
+    ASSERT_TRUE(
+        GetClient(kFirstProfileIndex)
+            ->AwaitSyncSetupCompletion(/*skip_passphrase_verification=*/false));
+    WaitForCounting();
+    ASSERT_TRUE(sync_service->GetActiveDataTypes().Has(
+        syncer::HISTORY_DELETE_DIRECTIVES));
+  }
+
   // We stop syncing history deletion in particular. This restarts the counter.
   syncer::ModelTypeSet everything_except_history =
       syncer::UserSelectableTypes();

chrome/browser/sync/test/integration/enable_disable_test.cc

@@ -14,6 +14,7 @@
 #include "components/sync/base/model_type.h"
 #include "components/sync/base/sync_prefs.h"
 #include "components/sync/driver/sync_driver_switches.h"
+#include "components/unified_consent/feature.h"
 
 using base::FeatureList;
 using syncer::ModelType;
@@ -26,8 +27,6 @@ using syncer::UserSelectableTypes;
 
 namespace {
 
-const bool kUserEventsSeparatePrefGroup = false;
-
 // Some types show up in multiple groups. This means that there are at least two
 // user selectable groups that will cause these types to become enabled. This
 // affects our tests because we cannot assume that before enabling a multi type
@@ -42,7 +41,8 @@ ModelTypeSet MultiGroupTypes(const SyncPrefs& sync_prefs,
   // elsewhere in the file).
   for (ModelType st : selectable_types) {
     const ModelTypeSet grouped_types = sync_prefs.ResolvePrefGroups(
-        registered_types, ModelTypeSet(st), kUserEventsSeparatePrefGroup);
+        registered_types, ModelTypeSet(st),
+        unified_consent::IsUnifiedConsentFeatureEnabled());
     for (ModelType gt : grouped_types) {
       if (seen.Has(gt)) {
         multi.Put(gt);
@@ -109,10 +109,10 @@ class EnableDisableSingleClientTest : public SyncTest {
   }
 
   ModelTypeSet ResolveGroup(ModelType type) {
-    return Difference(
-        sync_prefs_->ResolvePrefGroups(registered_types_, ModelTypeSet(type),
-                                       kUserEventsSeparatePrefGroup),
-        ProxyTypes());
+    return Difference(sync_prefs_->ResolvePrefGroups(
+                          registered_types_, ModelTypeSet(type),
+                          unified_consent::IsUnifiedConsentFeatureEnabled()),
+                      ProxyTypes());
   }
 
   ModelTypeSet WithoutMultiTypes(const ModelTypeSet& input) {

chrome/browser/sync/test/integration/profile_sync_service_harness.cc

@@ -530,7 +530,13 @@ bool ProfileSyncServiceHarness::EnableSyncForAllDatatypes() {
     return false;
   }
 
-  service()->OnUserChoseDatatypes(true, syncer::UserSelectableTypes());
+  if (unified_consent::IsUnifiedConsentFeatureEnabled()) {
+    // Setting unified consent given to true will enable all sync data types.
+    UnifiedConsentServiceFactory::GetForProfile(profile_)
+        ->SetUnifiedConsentGiven(true);
+  } else {
+    service()->OnUserChoseDatatypes(true, syncer::UserSelectableTypes());
+  }
   if (AwaitSyncSetupCompletion(/*skip_passphrase_verification=*/false)) {
     DVLOG(1) << "EnableSyncForAllDatatypes(): Enabled sync for all datatypes "
              << "on " << profile_debug_name_ << ".";

chrome/test/data/webui/settings/people_page_test.js

@@ -17,6 +17,9 @@ cr.define('settings_people_page', function() {
         easyUnlockAllowed: false,
         // Force Dice off. Dice is tested in the DiceUITest suite.
         diceEnabled: false,
+        // Force Unified Consent off. Unified Consent is tested in the
+        // UnifiedConsentUITest suite.
+        unifiedConsentEnabled: false,
       });
     });
 

testing/variations/fieldtrial_testing_config.json

@@ -4563,6 +4563,23 @@
             ]
         }
     ],
+    "UnifiedConsent": [
+        {
+            "platforms": [
+                "linux",
+                "mac",
+                "windows"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled2",
+                    "enable_features": [
+                        "UnifiedConsent"
+                    ]
+                }
+            ]
+        }
+    ],
     "UpdateMenuItem": [
         {
             "platforms": [