[Autofill Assistant] Added second container for generic UI.

This CL adds a second container for generic UI to the CollectUserData
action. The first container is right after prepended_sections (no
change), the new second container is after appended_sections.

Conceptually, this will allow the specification of additional sections,
both prepended and appended ones, in either the dedicated proto or via
generic UI.

In the mid-term, I plan to remove those legacy additional sections
completely, but for now, the two will co-exist.

Bug: b/145043394
Change-Id: Iaabfa5fd7d3b71b287e9b0458fcd0790553ee490
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2030488
Commit-Queue: Clemens Arbesser <arbesser@google.com>
Reviewed-by: Mathias Carlen <mcarlen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737313}

chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataBinder.java

@@ -60,7 +60,8 @@ class AssistantCollectUserDataBinder
         private final AssistantInfoSection mInfoSection;
         private final AssistantAdditionalSectionContainer mPrependedSections;
         private final AssistantAdditionalSectionContainer mAppendedSections;
-        private final ViewGroup mGenericUserInterfaceContainer;
+        private final ViewGroup mGenericUserInterfaceContainerPrepended;
+        private final ViewGroup mGenericUserInterfaceContainerAppended;
         private final Object mDividerTag;
         private final Activity mActivity;
 
@@ -75,7 +76,9 @@ class AssistantCollectUserDataBinder
                 AssistantInfoSection infoSection,
                 AssistantAdditionalSectionContainer prependedSections,
                 AssistantAdditionalSectionContainer appendedSections,
-                ViewGroup genericUserInterfaceContainer, Object dividerTag, Activity activity) {
+                ViewGroup genericUserInterfaceContainerPrepended,
+                ViewGroup genericUserInterfaceContainerAppended, Object dividerTag,
+                Activity activity) {
             mRootView = rootView;
             mPaymentRequestExpanderAccordion = accordion;
             mSectionToSectionPadding = sectionPadding;
@@ -90,7 +93,8 @@ class AssistantCollectUserDataBinder
             mInfoSection = infoSection;
             mPrependedSections = prependedSections;
             mAppendedSections = appendedSections;
-            mGenericUserInterfaceContainer = genericUserInterfaceContainer;
+            mGenericUserInterfaceContainerPrepended = genericUserInterfaceContainerPrepended;
+            mGenericUserInterfaceContainerAppended = genericUserInterfaceContainerAppended;
             mDividerTag = dividerTag;
             mActivity = activity;
         }
@@ -357,11 +361,18 @@ class AssistantCollectUserDataBinder
             view.mTermsAsCheckboxSection.setPrivacyNoticeText(
                     model.get(AssistantCollectUserDataModel.PRIVACY_NOTICE_TEXT));
             return true;
-        } else if (propertyKey == AssistantCollectUserDataModel.GENERIC_USER_INTERFACE) {
-            view.mGenericUserInterfaceContainer.removeAllViews();
-            if (model.get(AssistantCollectUserDataModel.GENERIC_USER_INTERFACE) != null) {
-                view.mGenericUserInterfaceContainer.addView(
-                        model.get(AssistantCollectUserDataModel.GENERIC_USER_INTERFACE));
+        } else if (propertyKey == AssistantCollectUserDataModel.GENERIC_USER_INTERFACE_PREPENDED) {
+            view.mGenericUserInterfaceContainerPrepended.removeAllViews();
+            if (model.get(AssistantCollectUserDataModel.GENERIC_USER_INTERFACE_PREPENDED) != null) {
+                view.mGenericUserInterfaceContainerPrepended.addView(
+                        model.get(AssistantCollectUserDataModel.GENERIC_USER_INTERFACE_PREPENDED));
+            }
+            return true;
+        } else if (propertyKey == AssistantCollectUserDataModel.GENERIC_USER_INTERFACE_APPENDED) {
+            view.mGenericUserInterfaceContainerAppended.removeAllViews();
+            if (model.get(AssistantCollectUserDataModel.GENERIC_USER_INTERFACE_APPENDED) != null) {
+                view.mGenericUserInterfaceContainerAppended.addView(
+                        model.get(AssistantCollectUserDataModel.GENERIC_USER_INTERFACE_APPENDED));
             }
             return true;
         } else if (propertyKey

chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataCoordinator.java

@@ -76,9 +76,9 @@ public class AssistantCollectUserDataCoordinator {
         AssistantAdditionalSectionContainer prependedSections =
                 new AssistantAdditionalSectionContainer(mActivity, paymentRequestExpanderAccordion);
 
-        LinearLayout genericUserInterfaceContainer = new LinearLayout(activity);
-        genericUserInterfaceContainer.setOrientation(LinearLayout.VERTICAL);
-        paymentRequestExpanderAccordion.addView(genericUserInterfaceContainer,
+        LinearLayout genericUserInterfaceContainerPrepended = new LinearLayout(activity);
+        genericUserInterfaceContainerPrepended.setOrientation(LinearLayout.VERTICAL);
+        paymentRequestExpanderAccordion.addView(genericUserInterfaceContainerPrepended,
                 new LinearLayout.LayoutParams(
                         ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
 
@@ -106,6 +106,12 @@ public class AssistantCollectUserDataCoordinator {
         AssistantAdditionalSectionContainer appendedSections =
                 new AssistantAdditionalSectionContainer(mActivity, paymentRequestExpanderAccordion);
 
+        LinearLayout genericUserInterfaceContainerAppended = new LinearLayout(activity);
+        genericUserInterfaceContainerAppended.setOrientation(LinearLayout.VERTICAL);
+        paymentRequestExpanderAccordion.addView(genericUserInterfaceContainerAppended,
+                new LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+
         AssistantTermsSection termsSection = new AssistantTermsSection(
                 mActivity, paymentRequestExpanderAccordion, /* showAsSingleCheckbox= */ false);
         AssistantTermsSection termsAsCheckboxSection =
@@ -139,7 +145,8 @@ public class AssistantCollectUserDataCoordinator {
                 paymentRequestExpanderAccordion, sectionToSectionPadding, loginSection,
                 contactDetailsSection, dateRangeStartSection, dateRangeEndSection,
                 paymentMethodSection, shippingAddressSection, termsSection, termsAsCheckboxSection,
-                infoSection, prependedSections, appendedSections, genericUserInterfaceContainer,
+                infoSection, prependedSections, appendedSections,
+                genericUserInterfaceContainerPrepended, genericUserInterfaceContainerAppended,
                 DIVIDER_TAG, activity);
         AssistantCollectUserDataBinder binder = new AssistantCollectUserDataBinder();
         PropertyModelChangeProcessor.create(model, mViewHolder, binder);

chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataModel.java

@@ -176,7 +176,10 @@ public class AssistantCollectUserDataModel extends PropertyModel {
     public static final WritableObjectPropertyKey<String> INFO_SECTION_TEXT =
             new WritableObjectPropertyKey<>();
 
-    public static final WritableObjectPropertyKey<View> GENERIC_USER_INTERFACE =
+    public static final WritableObjectPropertyKey<View> GENERIC_USER_INTERFACE_PREPENDED =
+            new WritableObjectPropertyKey<>();
+
+    public static final WritableObjectPropertyKey<View> GENERIC_USER_INTERFACE_APPENDED =
             new WritableObjectPropertyKey<>();
 
     public static final WritableObjectPropertyKey<ContactDescriptionOptions>
@@ -200,8 +203,9 @@ public class AssistantCollectUserDataModel extends PropertyModel {
                 DATE_RANGE_END_TIMESLOT, DATE_RANGE_END_DATE_LABEL, DATE_RANGE_END_TIME_LABEL,
                 DATE_RANGE_DATE_NOT_SET_ERROR_MESSAGE, DATE_RANGE_TIME_NOT_SET_ERROR_MESSAGE,
                 PREPENDED_SECTIONS, APPENDED_SECTIONS, TERMS_REQUIRE_REVIEW_TEXT,
-                PRIVACY_NOTICE_TEXT, INFO_SECTION_TEXT, GENERIC_USER_INTERFACE,
-                CONTACT_SUMMARY_DESCRIPTION_OPTIONS, CONTACT_FULL_DESCRIPTION_OPTIONS);
+                PRIVACY_NOTICE_TEXT, INFO_SECTION_TEXT, GENERIC_USER_INTERFACE_PREPENDED,
+                GENERIC_USER_INTERFACE_APPENDED, CONTACT_SUMMARY_DESCRIPTION_OPTIONS,
+                CONTACT_FULL_DESCRIPTION_OPTIONS);
 
         /**
          * Set initial state for basic type properties (others are implicitly null).
@@ -611,8 +615,13 @@ public class AssistantCollectUserDataModel extends PropertyModel {
     }
 
     @CalledByNative
-    private void setGenericUserInterface(@Nullable View userInterface) {
-        set(GENERIC_USER_INTERFACE, userInterface);
+    private void setGenericUserInterfacePrepended(@Nullable View userInterface) {
+        set(GENERIC_USER_INTERFACE_PREPENDED, userInterface);
+    }
+
+    @CalledByNative
+    private void setGenericUserInterfaceAppended(@Nullable View userInterface) {
+        set(GENERIC_USER_INTERFACE_APPENDED, userInterface);
     }
 
     @CalledByNative

chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantGenericUiTest.java

@@ -214,7 +214,7 @@ public class AutofillAssistantGenericUiTest {
         list.add((ActionProto) ActionProto.newBuilder()
                          .setCollectUserData(
                                  CollectUserDataProto.newBuilder()
-                                         .setGenericUserInterface(
+                                         .setGenericUserInterfacePrepended(
                                                  GenericUserInterfaceProto.newBuilder().setRootView(
                                                          rootView))
                                          .setPrivacyNoticeText(
@@ -266,19 +266,27 @@ public class AutofillAssistantGenericUiTest {
                                            .setIdentifier("clickableView2")
                                            .build();
 
-        ViewProto rootView =
+        ViewProto rootViewPrepended =
+                (ViewProto) ViewProto.newBuilder()
+                        .setViewContainer(
+                                ViewContainerProto.newBuilder()
+                                        .setLinearLayout(
+                                                LinearLayoutProto.newBuilder().setOrientation(
+                                                        LinearLayoutProto.Orientation.VERTICAL))
+                                        .addViews(clickableView1))
+                        .build();
+        ViewProto rootViewAppended =
                 (ViewProto) ViewProto.newBuilder()
                         .setViewContainer(
                                 ViewContainerProto.newBuilder()
                                         .setLinearLayout(
                                                 LinearLayoutProto.newBuilder().setOrientation(
                                                         LinearLayoutProto.Orientation.VERTICAL))
-                                        .addViews(clickableView1)
                                         .addViews(clickableView2))
                         .build();
 
-        List<InteractionProto> interactions = new ArrayList<>();
-        interactions.add(
+        List<InteractionProto> interactionsPrepended = new ArrayList<>();
+        interactionsPrepended.add(
                 (InteractionProto) InteractionProto.newBuilder()
                         .setTriggerEvent(EventProto.newBuilder().setOnViewClicked(
                                 OnViewClickedEventProto.newBuilder()
@@ -289,7 +297,8 @@ public class AutofillAssistantGenericUiTest {
                                 SetModelValueCallbackProto.newBuilder().setModelIdentifier(
                                         "output_1")))
                         .build());
-        interactions.add(
+        List<InteractionProto> interactionsAppended = new ArrayList<>();
+        interactionsAppended.add(
                 (InteractionProto) InteractionProto.newBuilder()
                         .setTriggerEvent(EventProto.newBuilder().setOnViewClicked(
                                 OnViewClickedEventProto.newBuilder()
@@ -301,28 +310,39 @@ public class AutofillAssistantGenericUiTest {
                                         "output_2")))
                         .build());
 
-        List<ModelProto.ModelValue> modelValues = new ArrayList<>();
-        modelValues.add((ModelProto.ModelValue) ModelProto.ModelValue.newBuilder()
-                                .setIdentifier("output_1")
-                                .build());
-        modelValues.add((ModelProto.ModelValue) ModelProto.ModelValue.newBuilder()
-                                .setIdentifier("output_2")
-                                .build());
+        List<ModelProto.ModelValue> modelValuesPrepended = new ArrayList<>();
+        modelValuesPrepended.add((ModelProto.ModelValue) ModelProto.ModelValue.newBuilder()
+                                         .setIdentifier("output_1")
+                                         .build());
+        List<ModelProto.ModelValue> modelValuesAppended = new ArrayList<>();
+        modelValuesAppended.add((ModelProto.ModelValue) ModelProto.ModelValue.newBuilder()
+                                        .setIdentifier("output_2")
+                                        .build());
+
+        GenericUserInterfaceProto genericUserInterfacePrepended =
+                (GenericUserInterfaceProto) GenericUserInterfaceProto.newBuilder()
+                        .setRootView(rootViewPrepended)
+                        .setInteractions(InteractionsProto.newBuilder().addAllInteractions(
+                                interactionsPrepended))
+                        .setModel(ModelProto.newBuilder().addAllValues(modelValuesPrepended))
+                        .build();
+
+        GenericUserInterfaceProto genericUserInterfaceAppended =
+                (GenericUserInterfaceProto) GenericUserInterfaceProto.newBuilder()
+                        .setRootView(rootViewAppended)
+                        .setInteractions(InteractionsProto.newBuilder().addAllInteractions(
+                                interactionsAppended))
+                        .setModel(ModelProto.newBuilder().addAllValues(modelValuesAppended))
+                        .build();
 
         ArrayList<ActionProto> list = new ArrayList<>();
         list.add((ActionProto) ActionProto.newBuilder()
                          .setCollectUserData(
                                  CollectUserDataProto.newBuilder()
-                                         .setGenericUserInterface(
-                                                 GenericUserInterfaceProto.newBuilder()
-                                                         .setRootView(rootView)
-                                                         .setInteractions(
-                                                                 InteractionsProto.newBuilder()
-                                                                         .addAllInteractions(
-                                                                                 interactions))
-                                                         .setModel(ModelProto.newBuilder()
-                                                                           .addAllValues(
-                                                                                   modelValues)))
+                                         .setGenericUserInterfacePrepended(
+                                                 genericUserInterfacePrepended)
+                                         .setGenericUserInterfaceAppended(
+                                                 genericUserInterfaceAppended)
                                          .setPrivacyNoticeText(
                                                  "Chrome will send selected data to example.com")
                                          .setRequestTermsAndConditions(false))
@@ -454,7 +474,7 @@ public class AutofillAssistantGenericUiTest {
         list.add((ActionProto) ActionProto.newBuilder()
                          .setCollectUserData(
                                  CollectUserDataProto.newBuilder()
-                                         .setGenericUserInterface(
+                                         .setGenericUserInterfacePrepended(
                                                  GenericUserInterfaceProto.newBuilder()
                                                          .setRootView(rootView)
                                                          .setInteractions(

chrome/browser/android/autofill_assistant/ui_controller_android.cc

@@ -851,7 +851,7 @@ void UiControllerAndroid::Detach() {
   if (!ui_delegate_)
     return;
 
-  collect_user_data_generic_ui_controller_.reset();
+  ResetGenericUiControllers();
 
   // Capture the debug context, for including into a feedback possibly sent
   // later.
@@ -970,9 +970,7 @@ void UiControllerAndroid::OnCollectUserDataOptionsChanged(
   JNIEnv* env = AttachCurrentThread();
   auto jmodel = GetCollectUserDataModel();
   if (!collect_user_data_options) {
-    collect_user_data_generic_ui_controller_.reset();
-    Java_AssistantCollectUserDataModel_setGenericUserInterface(env, jmodel,
-                                                               nullptr);
+    ResetGenericUiControllers();
     Java_AssistantCollectUserDataModel_setVisible(env, jmodel, false);
     return;
   }
@@ -1103,18 +1101,25 @@ void UiControllerAndroid::OnCollectUserDataOptionsChanged(
       env, jmodel,
       CreateJavaAdditionalSections(
           env, collect_user_data_options->additional_appended_sections));
-  if (collect_user_data_options->generic_user_interface.has_value()) {
-    auto jcontext =
-        Java_AutofillAssistantUiController_getContext(env, java_object_);
-    collect_user_data_generic_ui_controller_ =
-        GenericUiControllerAndroid::CreateFromProto(
-            *collect_user_data_options->generic_user_interface, jcontext,
-            generic_ui_delegate_.GetJavaObject(), ui_delegate_->GetUserModel(),
-            ui_delegate_->GetEventHandler());
-    Java_AssistantCollectUserDataModel_setGenericUserInterface(
+
+  if (collect_user_data_options->generic_user_interface_prepended.has_value()) {
+    collect_user_data_prepended_generic_ui_controller_ =
+        CreateGenericUiControllerForProto(
+            *collect_user_data_options->generic_user_interface_prepended);
+    Java_AssistantCollectUserDataModel_setGenericUserInterfacePrepended(
+        env, jmodel,
+        collect_user_data_prepended_generic_ui_controller_ != nullptr
+            ? collect_user_data_prepended_generic_ui_controller_->GetRootView()
+            : nullptr);
+  }
+  if (collect_user_data_options->generic_user_interface_appended.has_value()) {
+    collect_user_data_appended_generic_ui_controller_ =
+        CreateGenericUiControllerForProto(
+            *collect_user_data_options->generic_user_interface_appended);
+    Java_AssistantCollectUserDataModel_setGenericUserInterfaceAppended(
         env, jmodel,
-        collect_user_data_generic_ui_controller_ != nullptr
-            ? collect_user_data_generic_ui_controller_->GetRootView()
+        collect_user_data_appended_generic_ui_controller_ != nullptr
+            ? collect_user_data_appended_generic_ui_controller_->GetRootView()
             : nullptr);
   }
 
@@ -1562,4 +1567,27 @@ void UiControllerAndroid::OnFatalError(
       base::android::ConvertJavaStringToUTF8(env, jmessage),
       static_cast<Metrics::DropOutReason>(jreason));
 }
+
+void UiControllerAndroid::ResetGenericUiControllers() {
+  JNIEnv* env = AttachCurrentThread();
+  auto jmodel = GetCollectUserDataModel();
+  collect_user_data_prepended_generic_ui_controller_.reset();
+  collect_user_data_appended_generic_ui_controller_.reset();
+  Java_AssistantCollectUserDataModel_setGenericUserInterfacePrepended(
+      env, jmodel, nullptr);
+  Java_AssistantCollectUserDataModel_setGenericUserInterfaceAppended(
+      env, jmodel, nullptr);
+}
+
+std::unique_ptr<GenericUiControllerAndroid>
+UiControllerAndroid::CreateGenericUiControllerForProto(
+    const GenericUserInterfaceProto& proto) {
+  JNIEnv* env = AttachCurrentThread();
+  auto jcontext =
+      Java_AutofillAssistantUiController_getContext(env, java_object_);
+  return GenericUiControllerAndroid::CreateFromProto(
+      proto, jcontext, generic_ui_delegate_.GetJavaObject(),
+      ui_delegate_->GetUserModel(), ui_delegate_->GetEventHandler());
+}
+
 }  // namespace autofill_assistant

chrome/browser/android/autofill_assistant/ui_controller_android.h

@@ -210,6 +210,10 @@ class UiControllerAndroid : public ControllerObserver {
   void UpdateSuggestions(const std::vector<UserAction>& GetUserActions);
   void HideKeyboardIfFocusNotOnText();
 
+  void ResetGenericUiControllers();
+  std::unique_ptr<GenericUiControllerAndroid> CreateGenericUiControllerForProto(
+      const GenericUserInterfaceProto& proto);
+
   // Hide the UI, show a snackbar with an undo button, and execute the given
   // action after a short delay unless the user taps the undo button.
   void ShowSnackbar(base::TimeDelta delay,
@@ -235,9 +239,11 @@ class UiControllerAndroid : public ControllerObserver {
   // Java-side AutofillAssistantUiController object.
   base::android::ScopedJavaGlobalRef<jobject> java_object_;
 
-  // Native controller for generic UI in collect user data action.
+  // Native controllers for generic UI in collect user data action.
+  std::unique_ptr<GenericUiControllerAndroid>
+      collect_user_data_prepended_generic_ui_controller_;
   std::unique_ptr<GenericUiControllerAndroid>
-      collect_user_data_generic_ui_controller_;
+      collect_user_data_appended_generic_ui_controller_;
 
   OverlayState desired_overlay_state_ = OverlayState::FULL;
   base::WeakPtrFactory<UiControllerAndroid> weak_ptr_factory_{this};

components/autofill_assistant/browser/actions/collect_user_data_action.cc

@@ -269,6 +269,21 @@ bool IsValidUserFormSection(
   return true;
 }
 
+// Merges |model_a| and |model_b| into a new model.
+// TODO(arbesser): deal with overlapping keys.
+autofill_assistant::ModelProto MergeModelProtos(
+    const autofill_assistant::ModelProto& model_a,
+    const autofill_assistant::ModelProto& model_b) {
+  autofill_assistant::ModelProto model_merged;
+  for (const auto& value : model_a.values()) {
+    *model_merged.add_values() = value;
+  }
+  for (const auto& value : model_b.values()) {
+    *model_merged.add_values() = value;
+  }
+  return model_merged;
+}
+
 }  // namespace
 
 namespace autofill_assistant {
@@ -573,10 +588,14 @@ void CollectUserDataAction::OnGetUserData(
             user_data->terms_and_conditions_ ==
             TermsAndConditionsState::ACCEPTED);
     if (user_model != nullptr &&
-        collect_user_data.has_generic_user_interface()) {
+        (collect_user_data.has_generic_user_interface_prepended() ||
+         collect_user_data.has_generic_user_interface_appended())) {
+      // Build the union of both models (this assumes that there are no
+      // overlapping model keys).
       *processed_action_proto_->mutable_collect_user_data_result()
-           ->mutable_model() =
-          collect_user_data.generic_user_interface().model();
+           ->mutable_model() = MergeModelProtos(
+          collect_user_data.generic_user_interface_prepended().model(),
+          collect_user_data.generic_user_interface_appended().model());
       user_model->UpdateProto(
           processed_action_proto_->mutable_collect_user_data_result()
               ->mutable_model());
@@ -803,9 +822,13 @@ bool CollectUserDataAction::CreateOptionsFromProto() {
     return false;
   }
 
-  if (collect_user_data.has_generic_user_interface()) {
-    collect_user_data_options_->generic_user_interface =
-        collect_user_data.generic_user_interface();
+  if (collect_user_data.has_generic_user_interface_prepended()) {
+    collect_user_data_options_->generic_user_interface_prepended =
+        collect_user_data.generic_user_interface_prepended();
+  }
+  if (collect_user_data.has_generic_user_interface_appended()) {
+    collect_user_data_options_->generic_user_interface_appended =
+        collect_user_data.generic_user_interface_appended();
   }
 
   // TODO(crbug.com/806868): Maybe we could refactor this to make the confirm

components/autofill_assistant/browser/actions/collect_user_data_action_unittest.cc

@@ -1668,5 +1668,76 @@ TEST_F(CollectUserDataActionTest, ResetsCardAndAddressIfNoLongerInList) {
   action.ProcessAction(callback_.Get());
 }
 
+TEST_F(CollectUserDataActionTest, GenericUiModelWritesToProtoResult) {
+  ModelProto::ModelValue value_1;
+  value_1.set_identifier("value_1_key");
+  value_1.mutable_value()->mutable_strings()->add_values(
+      "value_1_initial_value");
+  ModelProto::ModelValue value_1_modified;
+  value_1_modified.set_identifier("value_1_key");
+  ModelProto::ModelValue value_2;
+  value_2.set_identifier("value_2_key");
+  value_2.mutable_value()->mutable_strings()->add_values(
+      "value_2_initial_value");
+  ModelProto::ModelValue value_2_modified;
+  value_2_modified.set_identifier("value_2_key");
+  value_2_modified.mutable_value()->mutable_strings()->add_values(
+      "value_2_modified");
+  ModelProto::ModelValue value_3;
+  value_3.set_identifier("value_3_key");
+  value_3.mutable_value()->mutable_strings()->add_values(
+      "value_3_initial_value");
+  ModelProto::ModelValue value_3_modified;
+  value_3_modified.set_identifier("value_3_key");
+  value_3_modified.mutable_value()->mutable_strings()->add_values(
+      "value_3_modified");
+  ModelProto::ModelValue value_4;
+  value_4.set_identifier("value_4_key");
+  value_4.mutable_value()->mutable_strings()->add_values(
+      "value_4_initial_value");
+
+  ON_CALL(mock_action_delegate_, CollectUserData(_))
+      .WillByDefault(
+          Invoke([=](CollectUserDataOptions* collect_user_data_options) {
+            user_data_.succeed_ = true;
+
+            user_model_.SetValue("value_1_key", value_1_modified.value());
+            user_model_.SetValue("value_2_key", value_2_modified.value());
+            user_model_.SetValue("value_3_key", value_3_modified.value());
+            // Leave value_4 at initial value.
+
+            std::move(collect_user_data_options->confirm_callback)
+                .Run(&user_data_, &user_model_);
+          }));
+
+  ActionProto action_proto;
+  auto* collect_user_data = action_proto.mutable_collect_user_data();
+  collect_user_data->set_request_terms_and_conditions(false);
+  auto* proto_model_prepended =
+      collect_user_data->mutable_generic_user_interface_prepended()
+          ->mutable_model();
+  *proto_model_prepended->add_values() = value_1;
+  *proto_model_prepended->add_values() = value_2;
+  auto* proto_model_appended =
+      collect_user_data->mutable_generic_user_interface_appended()
+          ->mutable_model();
+  *proto_model_appended->add_values() = value_3;
+  *proto_model_appended->add_values() = value_4;
+
+  EXPECT_CALL(
+      callback_,
+      Run(Pointee(AllOf(
+          Property(&ProcessedActionProto::status, ACTION_APPLIED),
+          Property(&ProcessedActionProto::collect_user_data_result,
+                   Property(&CollectUserDataResultProto::model,
+                            Property(&ModelProto::values,
+                                     UnorderedElementsAre(
+                                         value_1_modified, value_2_modified,
+                                         value_3_modified, value_4))))))));
+
+  CollectUserDataAction action(&mock_action_delegate_, action_proto);
+  action.ProcessAction(callback_.Get());
+}
+
 }  // namespace
 }  // namespace autofill_assistant

components/autofill_assistant/browser/service.proto

@@ -1440,7 +1440,7 @@ message UserFormSectionProto {
 
 // Asks to provide the data used by UseAddressAction and
 // UseCreditCardAction.
-// Next: 25
+// Next: 26
 message CollectUserDataProto {
   enum TermsAndConditionsState {
     // No choice has been made yet.
@@ -1511,8 +1511,12 @@ message CollectUserDataProto {
   repeated UserFormSectionProto additional_prepended_sections = 18;
   // An optional list of additional sections, which is below all other sections.
   repeated UserFormSectionProto additional_appended_sections = 19;
-  // Backend-configured user interface to show.
-  optional GenericUserInterfaceProto generic_user_interface = 22;
+  // Backend-configured user interface to show below
+  // |additional_prepended_sections|.
+  optional GenericUserInterfaceProto generic_user_interface_prepended = 22;
+  // Backend-configured user interface to show below
+  // |additional_appended_sections|.
+  optional GenericUserInterfaceProto generic_user_interface_appended = 25;
   // Text to be shown in a separate info section.
   optional string info_section_text = 24;
 }

components/autofill_assistant/browser/user_data.h

@@ -191,7 +191,8 @@ struct CollectUserDataOptions {
   DateTimeRangeProto date_time_range;
   std::vector<UserFormSectionProto> additional_prepended_sections;
   std::vector<UserFormSectionProto> additional_appended_sections;
-  base::Optional<GenericUserInterfaceProto> generic_user_interface;
+  base::Optional<GenericUserInterfaceProto> generic_user_interface_prepended;
+  base::Optional<GenericUserInterfaceProto> generic_user_interface_appended;
 
   base::OnceCallback<void(UserData*, const UserModel*)> confirm_callback;
   base::OnceCallback<void(int)> additional_actions_callback;

components/autofill_assistant/browser/user_model.cc

@@ -57,6 +57,13 @@ bool operator==(const ValueProto& value_a, const ValueProto& value_b) {
   return true;
 }
 
+// Comapres two |ModelValue| instances and returns true if they exactly match.
+bool operator==(const ModelProto::ModelValue& value_a,
+                const ModelProto::ModelValue& value_b) {
+  return value_a.identifier() == value_b.identifier() &&
+         value_a.value() == value_b.value();
+}
+
 // Intended for debugging. Writes a string representation of |values| to |out|.
 template <typename T>
 std::ostream& WriteRepeatedField(std::ostream& out, const T& values) {

components/autofill_assistant/browser/user_model.h

@@ -69,6 +69,10 @@ class UserModel {
 // |MessageDifferencer| for protobuf lite and can't rely on serialization.
 bool operator==(const ValueProto& value_a, const ValueProto& value_b);
 
+// Custom comparison operator for |ModelValue|.
+bool operator==(const ModelProto::ModelValue& value_a,
+                const ModelProto::ModelValue& value_b);
+
 // Intended for debugging.
 std::ostream& operator<<(std::ostream& out, const ValueProto& value);