Consent auditor: Add method RecordAccountPasswordsConsent()

This CL adds the plumbing in ConsentAuditor[Impl] to record this new
type of consent, and the corresponding sync proto messages. It's not
used so far; that will follow in another CL.

Bug: 1111252
Change-Id: Ib528273e88bfbd6546e6d1fc26c0884fef1e6e9d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2351923
Commit-Queue: Marc Treib <treib@chromium.org>
Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797365}

components/consent_auditor/consent_auditor.h

@@ -5,15 +5,13 @@
 #ifndef COMPONENTS_CONSENT_AUDITOR_CONSENT_AUDITOR_H_
 #define COMPONENTS_CONSENT_AUDITOR_CONSENT_AUDITOR_H_
 
-#include <memory>
 #include <string>
-#include <utility>
-#include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "components/keyed_service/core/keyed_service.h"
-#include "components/sync/model/model_type_sync_bridge.h"
+#include "components/sync/model/model_type_controller_delegate.h"
+#include "components/sync/protocol/user_consent_types.pb.h"
 #include "google_apis/gaia/core_account_id.h"
 
 namespace consent_auditor {
@@ -82,6 +80,12 @@ class ConsentAuditor : public KeyedService {
       const sync_pb::UserConsentTypes::AssistantActivityControlConsent&
           consent) = 0;
 
+  // Records the |consent| to download and use passwords from the signed-in GAIA
+  // account with the ID |account_id| (as defined in AccountInfo).
+  virtual void RecordAccountPasswordsConsent(
+      const CoreAccountId& account_id,
+      const sync_pb::UserConsentTypes::AccountPasswordsConsent& consent) = 0;
+
   // Records that the user consented to a |feature|. The user was presented with
   // |description_text| and accepted it by interacting |confirmation_text|
   // (e.g. clicking on a button; empty if not applicable).

components/consent_auditor/consent_auditor_impl.cc

@@ -131,6 +131,16 @@ void ConsentAuditorImpl::RecordAssistantActivityControlConsent(
   consent_sync_bridge_->RecordConsent(std::move(specifics));
 }
 
+void ConsentAuditorImpl::RecordAccountPasswordsConsent(
+    const CoreAccountId& account_id,
+    const sync_pb::UserConsentTypes::AccountPasswordsConsent& consent) {
+  std::unique_ptr<sync_pb::UserConsentSpecifics> specifics =
+      CreateUserConsentSpecifics(account_id, app_locale_, clock_);
+  specifics->mutable_account_passwords_consent()->CopyFrom(consent);
+
+  consent_sync_bridge_->RecordConsent(std::move(specifics));
+}
+
 void ConsentAuditorImpl::RecordLocalConsent(
     const std::string& feature,
     const std::string& description_text,

components/consent_auditor/consent_auditor_impl.h

@@ -14,12 +14,6 @@
 #include "base/time/clock.h"
 #include "components/consent_auditor/consent_auditor.h"
 #include "components/consent_auditor/consent_sync_bridge.h"
-#include "components/keyed_service/core/keyed_service.h"
-#include "components/sync/model/model_type_sync_bridge.h"
-
-namespace sync_pb {
-class UserConsentSpecifics;
-}  // namespace sync_pb
 
 class PrefService;
 class PrefRegistrySimple;
@@ -60,6 +54,10 @@ class ConsentAuditorImpl : public ConsentAuditor {
       const CoreAccountId& account_id,
       const sync_pb::UserConsentTypes::AssistantActivityControlConsent& consent)
       override;
+  void RecordAccountPasswordsConsent(
+      const CoreAccountId& account_id,
+      const sync_pb::UserConsentTypes::AccountPasswordsConsent& consent)
+      override;
   void RecordLocalConsent(const std::string& feature,
                           const std::string& description_text,
                           const std::string& confirmation_text) override;
@@ -67,13 +65,6 @@ class ConsentAuditorImpl : public ConsentAuditor {
       override;
 
  private:
-  std::unique_ptr<sync_pb::UserConsentSpecifics> ConstructUserConsentSpecifics(
-      const CoreAccountId& account_id,
-      Feature feature,
-      const std::vector<int>& description_grd_ids,
-      int confirmation_grd_id,
-      ConsentStatus status);
-
   PrefService* pref_service_;
   std::unique_ptr<ConsentSyncBridge> consent_sync_bridge_;
   std::string app_version_;

components/consent_auditor/fake_consent_auditor.cc

@@ -27,9 +27,9 @@ consent_auditor::ConsentStatus ConvertConsentStatus(
 
 namespace consent_auditor {
 
-FakeConsentAuditor::FakeConsentAuditor() {}
+FakeConsentAuditor::FakeConsentAuditor() = default;
 
-FakeConsentAuditor::~FakeConsentAuditor() {}
+FakeConsentAuditor::~FakeConsentAuditor() = default;
 
 void FakeConsentAuditor::RecordSyncConsent(
     const CoreAccountId& account_id,
@@ -49,6 +49,12 @@ void FakeConsentAuditor::RecordAssistantActivityControlConsent(
   NOTIMPLEMENTED();
 }
 
+void FakeConsentAuditor::RecordAccountPasswordsConsent(
+    const CoreAccountId& account_id,
+    const sync_pb::UserConsentTypes::AccountPasswordsConsent& consent) {
+  NOTIMPLEMENTED();
+}
+
 void FakeConsentAuditor::RecordGaiaConsent(
     const CoreAccountId& account_id,
     consent_auditor::Feature feature,

components/consent_auditor/fake_consent_auditor.h

@@ -41,6 +41,10 @@ class FakeConsentAuditor : public ConsentAuditor {
       const CoreAccountId& account_id,
       const sync_pb::UserConsentTypes::AssistantActivityControlConsent& consent)
       override;
+  void RecordAccountPasswordsConsent(
+      const CoreAccountId& account_id,
+      const sync_pb::UserConsentTypes::AccountPasswordsConsent& consent)
+      override;
 
   void RecordLocalConsent(const std::string& feature,
                           const std::string& description_text,

components/sync/protocol/proto_visitors.h

@@ -1038,6 +1038,7 @@ VISIT_PROTO_FIELDS(const sync_pb::UserConsentSpecifics& proto) {
   VISIT(arc_backup_and_restore_consent);
   VISIT(arc_location_service_consent);
   VISIT(arc_play_terms_of_service_consent);
+  VISIT(account_passwords_consent);
 }
 
 VISIT_PROTO_FIELDS(
@@ -1072,6 +1073,13 @@ VISIT_PROTO_FIELDS(const sync_pb::UserConsentTypes::UnifiedConsent& proto) {
   VISIT_ENUM(status);
 }
 
+VISIT_PROTO_FIELDS(
+    const sync_pb::UserConsentTypes::AccountPasswordsConsent& proto) {
+  VISIT_REP(description_grd_ids);
+  VISIT(confirmation_grd_id);
+  VISIT_ENUM(status);
+}
+
 VISIT_PROTO_FIELDS(const sync_pb::UserEventSpecifics& proto) {
   VISIT(event_time_usec);
   VISIT(navigation_id);

components/sync/protocol/user_consent_specifics.proto

@@ -57,6 +57,8 @@ message UserConsentSpecifics {
 
     UserConsentTypes.AssistantActivityControlConsent
         assistant_activity_control_consent = 14;
+
+    UserConsentTypes.AccountPasswordsConsent account_passwords_consent = 15;
   }
   reserved "arc_metrics_and_usage_consent";
   reserved 11;

components/sync/protocol/user_consent_types.proto

@@ -136,4 +136,19 @@ message UserConsentTypes {
     // whether the consent was given or not given.
     optional ConsentStatus status = 2;
   }
+
+  // The User Consent for downloading and using passwords stored in the user's
+  // Google Account. Determined during the opt-in flow for the feature.
+  message AccountPasswordsConsent {
+    // Ids of the strings of the consent text presented to the user.
+    repeated int32 description_grd_ids = 1;
+
+    // Id of the string of the UI element the user clicked in order to confirm
+    // the consent dialog.
+    optional int32 confirmation_grd_id = 2;
+
+    // The status of the consent. This specifies whether the consent was given
+    // or not given/revoked.
+    optional ConsentStatus status = 3;
+  }
 }