[Autofill Assistant] Integration test for starting a new flow.

This tests what happens when a new flow gets started in a new tab.

It also fixes a bug where:
Flow A started on Tab A, Flow B started on Tab B, switching from B to A,
since B was attached, the |Attach| was not called and B was shown on
Tab A.

The CL also introduces some safety null checks.

Bug: b/152967053
Change-Id: I9789e823fb4b1c129db35504484215ea50e1b7ec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2135746Reviewed-by: Clemens Arbesser <arbesser@google.com>
Reviewed-by: Mathias Carlen <mcarlen@chromium.org>
Commit-Queue: Sandro Maggi <sandromaggi@google.com>
Cr-Commit-Position: refs/heads/master@{#756671}

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

@@ -303,7 +303,7 @@ public class AutofillAssistantGenericUiTest {
                          .build());
         AutofillAssistantTestScript script = new AutofillAssistantTestScript(
                 (SupportedScriptProto) SupportedScriptProto.newBuilder()
-                        .setPath("form_target_website.html")
+                        .setPath("autofill_assistant_target_website.html")
                         .setPresentation(PresentationProto.newBuilder().setAutostart(true).setChip(
                                 ChipProto.newBuilder().setText("Autostart")))
                         .build(),
@@ -427,7 +427,7 @@ public class AutofillAssistantGenericUiTest {
                          .build());
         AutofillAssistantTestScript script = new AutofillAssistantTestScript(
                 (SupportedScriptProto) SupportedScriptProto.newBuilder()
-                        .setPath("form_target_website.html")
+                        .setPath("autofill_assistant_target_website.html")
                         .setPresentation(PresentationProto.newBuilder().setAutostart(true).setChip(
                                 ChipProto.newBuilder().setText("Autostart")))
                         .build(),
@@ -580,7 +580,7 @@ public class AutofillAssistantGenericUiTest {
                          .build());
         AutofillAssistantTestScript script = new AutofillAssistantTestScript(
                 (SupportedScriptProto) SupportedScriptProto.newBuilder()
-                        .setPath("form_target_website.html")
+                        .setPath("autofill_assistant_target_website.html")
                         .setPresentation(PresentationProto.newBuilder().setAutostart(true).setChip(
                                 ChipProto.newBuilder().setText("Autostart")))
                         .build(),
@@ -685,7 +685,7 @@ public class AutofillAssistantGenericUiTest {
                          .build());
         AutofillAssistantTestScript script = new AutofillAssistantTestScript(
                 (SupportedScriptProto) SupportedScriptProto.newBuilder()
-                        .setPath("form_target_website.html")
+                        .setPath("autofill_assistant_target_website.html")
                         .setPresentation(PresentationProto.newBuilder().setAutostart(true).setChip(
                                 ChipProto.newBuilder().setText("Autostart")))
                         .build(),
@@ -785,7 +785,7 @@ public class AutofillAssistantGenericUiTest {
                          .build());
         AutofillAssistantTestScript script = new AutofillAssistantTestScript(
                 (SupportedScriptProto) SupportedScriptProto.newBuilder()
-                        .setPath("form_target_website.html")
+                        .setPath("autofill_assistant_target_website.html")
                         .setPresentation(PresentationProto.newBuilder().setAutostart(true).setChip(
                                 ChipProto.newBuilder().setText("Autostart")))
                         .build(),
@@ -945,7 +945,7 @@ public class AutofillAssistantGenericUiTest {
                          .build());
         AutofillAssistantTestScript script = new AutofillAssistantTestScript(
                 (SupportedScriptProto) SupportedScriptProto.newBuilder()
-                        .setPath("form_target_website.html")
+                        .setPath("autofill_assistant_target_website.html")
                         .setPresentation(PresentationProto.newBuilder().setAutostart(true).setChip(
                                 ChipProto.newBuilder().setText("Autostart")))
                         .build(),
@@ -1027,7 +1027,7 @@ public class AutofillAssistantGenericUiTest {
                          .build());
         AutofillAssistantTestScript script = new AutofillAssistantTestScript(
                 (SupportedScriptProto) SupportedScriptProto.newBuilder()
-                        .setPath("form_target_website.html")
+                        .setPath("autofill_assistant_target_website.html")
                         .setPresentation(PresentationProto.newBuilder().setAutostart(true).setChip(
                                 ChipProto.newBuilder().setText("Autostart")))
                         .build(),
@@ -1169,7 +1169,7 @@ public class AutofillAssistantGenericUiTest {
                          .build());
         AutofillAssistantTestScript script = new AutofillAssistantTestScript(
                 (SupportedScriptProto) SupportedScriptProto.newBuilder()
-                        .setPath("form_target_website.html")
+                        .setPath("autofill_assistant_target_website.html")
                         .setPresentation(PresentationProto.newBuilder().setAutostart(true).setChip(
                                 ChipProto.newBuilder().setText("Autostart")))
                         .build(),
@@ -1263,7 +1263,7 @@ public class AutofillAssistantGenericUiTest {
                          .build());
         AutofillAssistantTestScript script = new AutofillAssistantTestScript(
                 (SupportedScriptProto) SupportedScriptProto.newBuilder()
-                        .setPath("form_target_website.html")
+                        .setPath("autofill_assistant_target_website.html")
                         .setPresentation(PresentationProto.newBuilder().setAutostart(true).setChip(
                                 ChipProto.newBuilder().setText("Autostart")))
                         .build(),
@@ -1358,7 +1358,7 @@ public class AutofillAssistantGenericUiTest {
                          .build());
         AutofillAssistantTestScript script = new AutofillAssistantTestScript(
                 (SupportedScriptProto) SupportedScriptProto.newBuilder()
-                        .setPath("form_target_website.html")
+                        .setPath("autofill_assistant_target_website.html")
                         .setPresentation(PresentationProto.newBuilder().setAutostart(true).setChip(
                                 ChipProto.newBuilder().setText("Autostart")))
                         .build(),
@@ -1459,7 +1459,7 @@ public class AutofillAssistantGenericUiTest {
                          .build());
         AutofillAssistantTestScript script = new AutofillAssistantTestScript(
                 (SupportedScriptProto) SupportedScriptProto.newBuilder()
-                        .setPath("form_target_website.html")
+                        .setPath("autofill_assistant_target_website.html")
                         .setPresentation(PresentationProto.newBuilder().setAutostart(true).setChip(
                                 ChipProto.newBuilder().setText("Autostart")))
                         .build(),
@@ -1549,7 +1549,7 @@ public class AutofillAssistantGenericUiTest {
                          .build());
         AutofillAssistantTestScript script = new AutofillAssistantTestScript(
                 (SupportedScriptProto) SupportedScriptProto.newBuilder()
-                        .setPath("form_target_website.html")
+                        .setPath("autofill_assistant_target_website.html")
                         .setPresentation(PresentationProto.newBuilder().setAutostart(true).setChip(
                                 ChipProto.newBuilder().setText("Autostart")))
                         .build(),
@@ -1636,7 +1636,7 @@ public class AutofillAssistantGenericUiTest {
                          .build());
         AutofillAssistantTestScript script = new AutofillAssistantTestScript(
                 (SupportedScriptProto) SupportedScriptProto.newBuilder()
-                        .setPath("form_target_website.html")
+                        .setPath("autofill_assistant_target_website.html")
                         .setPresentation(PresentationProto.newBuilder().setAutostart(true).setChip(
                                 ChipProto.newBuilder().setText("Autostart")))
                         .build(),
@@ -1727,7 +1727,7 @@ public class AutofillAssistantGenericUiTest {
                          .build());
         AutofillAssistantTestScript script = new AutofillAssistantTestScript(
                 (SupportedScriptProto) SupportedScriptProto.newBuilder()
-                        .setPath("form_target_website.html")
+                        .setPath("autofill_assistant_target_website.html")
                         .setPresentation(PresentationProto.newBuilder().setAutostart(true).setChip(
                                 ChipProto.newBuilder().setText("Autostart")))
                         .build(),
@@ -1838,7 +1838,7 @@ public class AutofillAssistantGenericUiTest {
                          .build());
         AutofillAssistantTestScript script = new AutofillAssistantTestScript(
                 (SupportedScriptProto) SupportedScriptProto.newBuilder()
-                        .setPath("form_target_website.html")
+                        .setPath("autofill_assistant_target_website.html")
                         .setPresentation(PresentationProto.newBuilder().setAutostart(true).setChip(
                                 ChipProto.newBuilder().setText("Autostart")))
                         .build(),
@@ -1980,7 +1980,7 @@ public class AutofillAssistantGenericUiTest {
                          .build());
         AutofillAssistantTestScript script = new AutofillAssistantTestScript(
                 (SupportedScriptProto) SupportedScriptProto.newBuilder()
-                        .setPath("form_target_website.html")
+                        .setPath("autofill_assistant_target_website.html")
                         .setPresentation(PresentationProto.newBuilder().setAutostart(true).setChip(
                                 ChipProto.newBuilder().setText("Autostart")))
                         .build(),

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

@@ -37,6 +37,7 @@ public class AutofillAssistantTestService
     /** The most recently received list of processed actions. */
     private @Nullable List<ProcessedActionProto> mProcessedActions;
     private int mNextActionsCounter;
+    private int mCurrentScriptIndex;
 
     /** Default constructor which disables animations. */
     AutofillAssistantTestService(List<AutofillAssistantTestScript> scripts) {
@@ -82,9 +83,11 @@ public class AutofillAssistantTestService
     /** @see AutofillAssistantService#getScriptsForUrl(String) */
     @Override
     public SupportsScriptResponseProto getScriptsForUrl(String url) {
+        // Return scripts one after the other. Note: Returning more than one script at once leads
+        // to a dropout with RENDER_PROCESS_GONE.
         SupportsScriptResponseProto.Builder builder = SupportsScriptResponseProto.newBuilder();
-        for (AutofillAssistantTestScript script : mScripts) {
-            builder.addScripts(script.getSupportedScript());
+        if (mCurrentScriptIndex < mScripts.size()) {
+            builder.addScripts(mScripts.get(mCurrentScriptIndex++).getSupportedScript());
         }
         builder.setClientSettings(mClientSettings);
         return builder.build();

chrome/browser/android/autofill_assistant/client_android.cc

@@ -97,8 +97,7 @@ ClientAndroid::ClientAndroid(content::WebContents* web_contents)
     : web_contents_(web_contents),
       java_object_(Java_AutofillAssistantClient_create(
           AttachCurrentThread(),
-          reinterpret_cast<intptr_t>(this))) {
-}
+          reinterpret_cast<intptr_t>(this))) {}
 
 ClientAndroid::~ClientAndroid() {
   if (controller_ != nullptr && started_) {
@@ -419,10 +418,11 @@ void ClientAndroid::AttachUI(
     }
   }
 
-  if (!ui_controller_android_->IsAttached()) {
+  if (!ui_controller_android_->IsAttached() ||
+      (controller_ != nullptr &&
+       !ui_controller_android_->IsAttachedTo(controller_.get()))) {
     if (!controller_)
       CreateController(nullptr);
-
     ui_controller_android_->Attach(web_contents_, this, controller_.get());
   }
 

chrome/browser/android/autofill_assistant/ui_controller_android.cc

@@ -384,6 +384,8 @@ void UiControllerAndroid::OnStateChanged(AutofillAssistantState new_state) {
 }
 
 void UiControllerAndroid::SetupForState() {
+  DCHECK(ui_delegate_ != nullptr);
+
   UpdateActions(ui_delegate_->GetUserActions());
   AutofillAssistantState state = ui_delegate_->GetState();
   bool should_prompt_action_expand_sheet =

chrome/browser/android/autofill_assistant/ui_controller_android.h

@@ -73,7 +73,12 @@ class UiControllerAndroid : public ControllerObserver {
   void Detach();
 
   // Returns true if the UI is attached to a delegate.
-  bool IsAttached() { return ui_delegate_; }
+  bool IsAttached() { return ui_delegate_ != nullptr; }
+
+  // Returns whether the UI is currently attached to the given delegate or not.
+  bool IsAttachedTo(UiDelegate* ui_delegate) {
+    return ui_delegate_ == ui_delegate;
+  }
 
   // Have the UI react as if a close or cancel button was pressed.
   //