webview: Remove AwContents.activityFromContext.

This method (now) just wraps ContextUtils.activityFromContext and adds a
trace, but it's not used consistently. The trace was added to diagnose
performance issues caused by class verification failures, but we should
have this under control now.

Change-Id: I2415cd99f0e9f337956888918388d36aaf6d05af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1862729
Commit-Queue: Richard Coles <torne@chromium.org>
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Auto-Submit: Richard Coles <torne@chromium.org>
Reviewed-by: Nate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706209}

android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java

@@ -37,7 +37,6 @@
 import com.android.webview.chromium.WebViewDelegateFactory.WebViewDelegate;
 
 import org.chromium.android_webview.AwConsoleMessage;
-import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwContentsClient;
 import org.chromium.android_webview.AwContentsClientBridge;
 import org.chromium.android_webview.AwGeolocationPermissions;
@@ -50,6 +49,7 @@
 import org.chromium.android_webview.permission.AwPermissionRequest;
 import org.chromium.android_webview.permission.Resource;
 import org.chromium.base.Callback;
+import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.metrics.ScopedSysTraceEvent;
@@ -720,7 +720,7 @@ private boolean showDefaultJsDialog(JsPromptResult res, int jsDialogType, String
             String message, String url) {
         // Note we must unwrap the Context here due to JsDialogHelper only using instanceof to
         // check if a Context is an Activity.
-        Context activityContext = AwContents.activityFromContext(mContext);
+        Context activityContext = ContextUtils.activityFromContext(mContext);
         if (activityContext == null) {
             Log.w(TAG, "Unable to create JsDialog without an Activity");
             return false;

android_webview/java/src/org/chromium/android_webview/AwAutofillUMA.java

@@ -7,6 +7,7 @@
 import android.content.Context;
 
 import org.chromium.autofill.mojom.SubmissionSource;
+import org.chromium.base.ContextUtils;
 import org.chromium.base.metrics.RecordHistogram;
 
 import java.util.concurrent.TimeUnit;
@@ -181,7 +182,7 @@ private int toUMAAutofillSessionValue() {
 
     public AwAutofillUMA(Context context) {
         RecordHistogram.recordBooleanHistogram(UMA_AUTOFILL_WEBVIEW_CREATED_BY_ACTIVITY_CONTEXT,
-                AwContents.activityFromContext(context) != null);
+                ContextUtils.activityFromContext(context) != null);
     }
 
     public void onFormSubmitted(int submissionSource) {

android_webview/java/src/org/chromium/android_webview/AwContents.java

@@ -6,7 +6,6 @@
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
-import android.app.Activity;
 import android.content.ComponentCallbacks2;
 import android.content.Context;
 import android.content.Intent;
@@ -1171,7 +1170,7 @@ private static WindowAndroidWrapper getWindowAndroid(Context context) {
         if (wrapper != null) return wrapper;
 
         try (ScopedSysTraceEvent e = ScopedSysTraceEvent.scoped("AwContents.getWindowAndroid")) {
-            boolean contextWrapsActivity = activityFromContext(context) != null;
+            boolean contextWrapsActivity = ContextUtils.activityFromContext(context) != null;
             if (contextWrapsActivity) {
                 ActivityWindowAndroid activityWindow;
                 try (ScopedSysTraceEvent e2 =
@@ -1529,11 +1528,6 @@ public static void setShouldDownloadFavicons() {
         AwContentsJni.get().setShouldDownloadFavicons();
     }
 
-    public static Activity activityFromContext(Context context) {
-        try (ScopedSysTraceEvent e = ScopedSysTraceEvent.scoped("AwContents.activityFromContext")) {
-            return ContextUtils.activityFromContext(context);
-        }
-    }
     /**
      * Disables contents of JS-to-Java bridge objects to be inspectable using
      * Object.keys() method and "for .. in" loops. This is intended for applications

android_webview/java/src/org/chromium/android_webview/AwContentsClient.java

@@ -25,6 +25,7 @@
 import org.chromium.android_webview.permission.AwPermissionRequest;
 import org.chromium.android_webview.safe_browsing.AwSafeBrowsingResponse;
 import org.chromium.base.Callback;
+import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.ScopedSysTraceEvent;
@@ -242,7 +243,7 @@ private static boolean sendBrowsingIntent(Context context, String url, boolean h
         intent.putExtra(Browser.EXTRA_APPLICATION_ID, context.getPackageName());
 
         // Check whether the context is activity context.
-        if (AwContents.activityFromContext(context) == null) {
+        if (ContextUtils.activityFromContext(context) == null) {
             Log.w(TAG, "Cannot call startActivity on non-activity context.");
             return false;
         }

android_webview/java/src/org/chromium/android_webview/ResourcesContextWrapperFactory.java

@@ -10,6 +10,8 @@
 import android.content.Intent;
 import android.view.LayoutInflater;
 
+import org.chromium.base.ContextUtils;
+
 import java.lang.ref.WeakReference;
 import java.util.WeakHashMap;
 
@@ -110,7 +112,7 @@ public void unregisterComponentCallbacks(ComponentCallbacks callback) {
 
         @Override
         public void startActivity(Intent intent) {
-            if (AwContents.activityFromContext(this) == null) {
+            if (ContextUtils.activityFromContext(this) == null) {
                 // FLAG_ACTIVITY_NEW_TASK is needed to start activities from a non-activity
                 // context.
                 intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);