[AA Direct Actions] Remove perform_assistant_action

Before this patch perform_assistant_action was used to trigger Autofill
Assistant layer scripts. For an external DirectAction caller it is
expected to get a flattened list of direct actions instead of this
indirection. The indirection got removed in a previous patch and the
perform_assistant_action can now be removed too.

Bug: b/138833619
Change-Id: Ib41fe034dc1cdeaae38582c7f5389ed8d1b3946a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879453
Commit-Queue: Mathias Carlen <mcarlen@chromium.org>
Reviewed-by: Stephane Zermatten <szermatt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710269}

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

@@ -112,20 +112,9 @@ public class AutofillAssistantDirectActionHandlerTest {
         FakeDirectActionReporter reporter = new FakeDirectActionReporter();
         reportAvailableDirectActions(mHandler, reporter);
 
-        assertEquals(2, reporter.mActions.size());
+        assertEquals(1, reporter.mActions.size());
 
-        FakeDirectActionDefinition perform = reporter.mActions.get(0);
-        assertEquals("perform_assistant_action", perform.mId);
-        assertEquals(2, perform.mParameters.size());
-        assertEquals("name", perform.mParameters.get(0).mName);
-        assertEquals(Type.STRING, perform.mParameters.get(0).mType);
-        assertEquals("experiment_ids", perform.mParameters.get(1).mName);
-        assertEquals(Type.STRING, perform.mParameters.get(1).mType);
-        assertEquals(1, perform.mResults.size());
-        assertEquals("success", perform.mResults.get(0).mName);
-        assertEquals(Type.BOOLEAN, perform.mResults.get(0).mType);
-
-        FakeDirectActionDefinition fetch = reporter.mActions.get(1);
+        FakeDirectActionDefinition fetch = reporter.mActions.get(0);
         assertEquals("fetch_website_actions", fetch.mId);
         assertEquals(2, fetch.mParameters.size());
         assertEquals("user_name", fetch.mParameters.get(0).mName);
@@ -145,12 +134,10 @@ public class AutofillAssistantDirectActionHandlerTest {
         reportAvailableDirectActions(mHandler, reporter);
 
         // Now that the AA stack is up, the fetdch_website_actions should no longer show up.
-        assertEquals(3, reporter.mActions.size());
-
-        assertEquals("perform_assistant_action", reporter.mActions.get(0).mId);
+        assertEquals(2, reporter.mActions.size());
 
         // Now we expect 2 dyamic actions "search" and "action2".
-        FakeDirectActionDefinition search = reporter.mActions.get(1);
+        FakeDirectActionDefinition search = reporter.mActions.get(0);
         assertEquals("search", search.mId);
         assertEquals(2, search.mParameters.size());
         assertEquals("experiment_ids", search.mParameters.get(0).mName);
@@ -161,7 +148,7 @@ public class AutofillAssistantDirectActionHandlerTest {
         assertEquals("success", search.mResults.get(0).mName);
         assertEquals(Type.BOOLEAN, search.mResults.get(0).mType);
 
-        FakeDirectActionDefinition action2 = reporter.mActions.get(2);
+        FakeDirectActionDefinition action2 = reporter.mActions.get(1);
         assertEquals("action2", action2.mId);
         assertEquals(1, action2.mParameters.size());
         assertEquals("experiment_ids", action2.mParameters.get(0).mName);
@@ -180,20 +167,9 @@ public class AutofillAssistantDirectActionHandlerTest {
         FakeDirectActionReporter reporter = new FakeDirectActionReporter();
         reportAvailableDirectActions(mHandler, reporter);
 
-        assertEquals(2, reporter.mActions.size());
+        assertEquals(1, reporter.mActions.size());
 
-        FakeDirectActionDefinition perform = reporter.mActions.get(0);
-        assertEquals("perform_assistant_action", perform.mId);
-        assertEquals(2, perform.mParameters.size());
-        assertEquals("name", perform.mParameters.get(0).mName);
-        assertEquals(Type.STRING, perform.mParameters.get(0).mType);
-        assertEquals("experiment_ids", perform.mParameters.get(1).mName);
-        assertEquals(Type.STRING, perform.mParameters.get(1).mType);
-        assertEquals(1, perform.mResults.size());
-        assertEquals("success", perform.mResults.get(0).mName);
-        assertEquals(Type.BOOLEAN, perform.mResults.get(0).mType);
-
-        FakeDirectActionDefinition fetch = reporter.mActions.get(1);
+        FakeDirectActionDefinition fetch = reporter.mActions.get(0);
         assertEquals("fetch_website_actions", fetch.mId);
         assertEquals(2, fetch.mParameters.size());
         assertEquals("user_name", fetch.mParameters.get(0).mName);
@@ -296,23 +272,22 @@ public class AutofillAssistantDirectActionHandlerTest {
         }));
     }
 
-    /** Calls perform_assistant_action and returns the result. */
+    /** Performs direct action |name| and returns the result. */
     private Boolean performAction(String name, Bundle arguments) throws Exception {
-        return performActionAsync(name, arguments).waitForResult("perform_assistant_action");
+        return performActionAsync(name, arguments).waitForResult("success");
     }
 
     /**
-     * Calls perform_assistant_action and returns a {@link WaitingCallback} that'll eventually
+     * Performs direct action |name| and returns a {@link WaitingCallback} that'll eventually
      * contain the result.
      */
     private WaitingCallback<Boolean> performActionAsync(String name, Bundle arguments)
             throws Exception {
         WaitingCallback<Boolean> callback = new WaitingCallback<Boolean>();
         Bundle allArguments = new Bundle(arguments);
-        if (!name.isEmpty()) allArguments.putString("name", name);
         TestThreadUtils.runOnUiThreadBlocking(
                 ()
-                        -> mHandler.performDirectAction("perform_assistant_action", allArguments,
+                        -> mHandler.performDirectAction(name, allArguments,
                                 (bundle) -> callback.onResult(bundle.getBoolean("success"))));
         return callback;
     }

chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantDirectActionHandler.java

@@ -28,8 +28,6 @@ import java.util.Arrays;
 public class AutofillAssistantDirectActionHandler implements DirectActionHandler {
     private static final String FETCH_WEBSITE_ACTIONS = "fetch_website_actions";
     private static final String FETCH_WEBSITE_ACTIONS_RESULT = "success";
-    // TODO(b/138833619): Remove this action entirely.
-    private static final String PERFORM_AA_ACTION = "perform_assistant_action";
     private static final String AA_ACTION_RESULT = "success";
     private static final String ACTION_NAME = "name";
     private static final String EXPERIMENT_IDS = "experiment_ids";
@@ -69,11 +67,6 @@ public class AutofillAssistantDirectActionHandler implements DirectActionHandler
             return;
         }
 
-        reporter.addDirectAction(PERFORM_AA_ACTION)
-                .withParameter(ACTION_NAME, Type.STRING, /* required= */ false)
-                .withParameter(EXPERIMENT_IDS, Type.STRING, /* required= */ false)
-                .withResult(AA_ACTION_RESULT, Type.BOOLEAN);
-
         ThreadUtils.assertOnUiThread();
         if (mDelegate == null || (mDelegate != null && !mDelegate.hasRunFirstCheck())) {
             reporter.addDirectAction(FETCH_WEBSITE_ACTIONS)
@@ -106,10 +99,6 @@ public class AutofillAssistantDirectActionHandler implements DirectActionHandler
             fetchWebsiteActions(arguments, callback);
             return true;
         }
-        if (actionId.equals(PERFORM_AA_ACTION)) {
-            performAction(arguments, callback);
-            return true;
-        }
         // Only handle and perform the action if it is known to the controller.
         if (isActionAvailable(actionId) || ONBOARDING_ACTION.equals(actionId)) {
             arguments.putString("name", actionId);