Revert "Android: Fix StrictMode violation on Smart Selection icon loading"

This reverts commit 4a6ccde5.

Reason for revert: Caused b/176427193, will have another change to resolve the strict mode violation.

Original change's description:
> Android: Fix StrictMode violation on Smart Selection icon loading
>
> We are calling Icon#loadDrawable on the UI thread previously, based on
> the Android doc, we should use Icon#loadDrawableAsync instead.
>
> Previously, this is not enforced, but now we encountered a StrictMode
> violation for this.
>
> Since now we are calling Icon#loadDrawableAsync, we need to pre-warm the
> Drawable before we show the popup menu, otherwise the icon will be set
> after the popup menu showed for the first time.
>
> Bug: 1129211
> Change-Id: Iac5127a307d1d2d124a4b2debb7b021a2be2da75
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2562059
> Reviewed-by: Bo <boliu@chromium.org>
> Reviewed-by: Richard Coles <torne@chromium.org>
> Commit-Queue: Shimi Zhang <ctzsm@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#831948}

TBR=boliu@chromium.org,torne@chromium.org,ctzsm@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1129211
Change-Id: I6335c8eeec4b08b190a97fbea73eefc20fd280d8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2626195Reviewed-by: Shimi Zhang <ctzsm@chromium.org>
Commit-Queue: Shimi Zhang <ctzsm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842850}

base/android/java/src/org/chromium/base/compat/ApiHelperForP.java

@@ -5,19 +5,13 @@
 package org.chromium.base.compat;
 
 import android.annotation.TargetApi;
-import android.app.RemoteAction;
 import android.content.pm.PackageInfo;
 import android.location.LocationManager;
 import android.net.LinkProperties;
 import android.os.Build;
-import android.view.textclassifier.TextClassification;
-
-import androidx.annotation.NonNull;
 
 import org.chromium.base.annotations.VerifiesOnP;
 
-import java.util.List;
-
 /**
  * Utility class to use new APIs that were added in P (API level 28). These need to exist in a
  * separate class so that Android framework can successfully verify classes without
@@ -47,9 +41,4 @@ public final class ApiHelperForP {
     public static boolean isLocationEnabled(LocationManager locationManager) {
         return locationManager.isLocationEnabled();
     }
-
-    /** See {@link TextClassification#getActions() } */
-    public static @NonNull List<RemoteAction> getActions(TextClassification classification) {
-        return classification.getActions();
-    }
 }

content/public/android/java/src/org/chromium/content/browser/selection/AdditionalMenuItemProviderImpl.java

@@ -9,7 +9,6 @@ import android.app.PendingIntent;
 import android.app.RemoteAction;
 import android.content.Context;
 import android.os.Build;
-import android.os.Handler;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -54,7 +53,7 @@ public class AdditionalMenuItemProviderImpl implements AdditionalMenuItemProvide
 
             MenuItem item = menu.findItem(android.R.id.textAssist);
             if (primaryAction.shouldShowIcon()) {
-                setItemIconFromRemoteAction(context, primaryAction, item);
+                item.setIcon(primaryAction.getIcon().loadDrawable(context));
             } else {
                 item.setIcon(null);
             }
@@ -73,7 +72,7 @@ public class AdditionalMenuItemProviderImpl implements AdditionalMenuItemProvide
                     MENU_ITEM_ORDER_SECONDARY_ASSIST_ACTIONS_START + i, action.getTitle());
             item.setContentDescription(action.getContentDescription());
             if (action.shouldShowIcon()) {
-                setItemIconFromRemoteAction(context, action, item);
+                item.setIcon(action.getIcon().loadDrawable(context));
             }
             // Set this flag to SHOW_AS_ACTION_IF_ROOM to match text processing menu items. So
             // Android could put them to the same level and then consider their actual order.
@@ -106,9 +105,4 @@ public class AdditionalMenuItemProviderImpl implements AdditionalMenuItemProvide
             }
         };
     }
-
-    private static void setItemIconFromRemoteAction(
-            Context context, RemoteAction action, MenuItem item) {
-        action.getIcon().loadDrawableAsync(context, item::setIcon, new Handler());
-    }
 }

content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionProvider.java

@@ -6,7 +6,6 @@ package org.chromium.content.browser.selection;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
-import android.app.RemoteAction;
 import android.content.Context;
 import android.os.Build;
 import android.os.Handler;
@@ -18,7 +17,6 @@ import android.view.textclassifier.TextSelection;
 
 import androidx.annotation.IntDef;
 
-import org.chromium.base.compat.ApiHelperForP;
 import org.chromium.base.task.AsyncTask;
 import org.chromium.content.browser.WindowEventObserver;
 import org.chromium.content.browser.WindowEventObserverManager;
@@ -28,7 +26,6 @@ import org.chromium.ui.base.WindowAndroid;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.util.List;
 
 /**
  * Controls Smart Text selection. Talks to the Android TextClassificationManager API.
@@ -192,27 +189,7 @@ public class SmartSelectionProvider {
 
         @Override
         protected void onPostExecute(SelectionClient.Result result) {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-                mResultCallback.onClassified(result);
-                return;
-            }
-
-            Context context = mWindowAndroid.getContext().get();
-            if (context == null || result.textClassification == null) {
-                mResultCallback.onClassified(result);
-                return;
-            }
-
-            List<RemoteAction> actions = ApiHelperForP.getActions(result.textClassification);
-            if (actions == null || actions.size() == 0) {
-                mResultCallback.onClassified(result);
-                return;
-            }
-
-            RemoteAction primaryAction = actions.get(0);
-            // Wait until the drawable for the primary action is loaded.
-            primaryAction.getIcon().loadDrawableAsync(
-                    context, (drawable) -> mResultCallback.onClassified(result), new Handler());
+            mResultCallback.onClassified(result);
         }
     }
 }