[WV Support Library] Add a crash key that indicates androidx.webkit version.

Android side: https://android-review.googlesource.com/c/platform/frameworks/support/+/1138298

Bug: 1012753
Change-Id: I6cc6e045fad9044f72cda7f751390abb39fea94a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1848701Reviewed-by: Tobias Sargeant <tobiasjs@chromium.org>
Commit-Queue: Anna Malova <amalova@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710340}

android_webview/browser/aw_debug.cc

@@ -185,4 +185,12 @@ static void JNI_AwDebug_SetNonWhiteListedKeyForTesting(JNIEnv* env) {
   crash_key.Set("AW_DEBUG_VALUE");
 }
 
+static void JNI_AwDebug_SetSupportLibraryWebkitVersionCrashKey(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jstring>& version) {
+  static ::crash_reporter::CrashKeyString<32> crash_key(
+      crash_keys::kSupportLibraryWebkitVersion);
+  crash_key.Set(ConvertJavaStringToUTF8(env, version));
+}
+
 }  // namespace android_webview

android_webview/common/crash_reporter/crash_keys.cc

@@ -15,12 +15,15 @@ const char kAppPackageVersionCode[] = "app-package-version-code";
 
 const char kAndroidSdkInt[] = "android-sdk-int";
 
+const char kSupportLibraryWebkitVersion[] = "androidx-webkit-version";
+
 // clang-format off
 const char* const kWebViewCrashKeyWhiteList[] = {
     "AW_WHITELISTED_DEBUG_KEY",
     kAppPackageName,
     kAppPackageVersionCode,
     kAndroidSdkInt,
+    kSupportLibraryWebkitVersion,
 
     // process type
     "ptype",

android_webview/common/crash_reporter/crash_keys.h

@@ -22,6 +22,8 @@ extern const char kAppPackageVersionCode[];
 
 extern const char kAndroidSdkInt[];
 
+extern const char kSupportLibraryWebkitVersion[];
+
 }  // namespace crash_keys
 }  // namespace android_webview
 

android_webview/java/src/org/chromium/android_webview/AwDebug.java

@@ -55,11 +55,16 @@ public class AwDebug {
         AwDebugJni.get().setNonWhiteListedKeyForTesting();
     }
 
+    public static void setSupportLibraryWebkitVersionCrashKey(String version) {
+        AwDebugJni.get().setSupportLibraryWebkitVersionCrashKey(version);
+    }
+
     @NativeMethods
     interface Natives {
         boolean dumpWithoutCrashing(String dumpPath);
         void initCrashKeysForWebViewTesting();
         void setWhiteListedKeyForTesting();
         void setNonWhiteListedKeyForTesting();
+        void setSupportLibraryWebkitVersionCrashKey(String version);
     }
 }

android_webview/support_library/boundary_interfaces/src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java

@@ -18,4 +18,5 @@ public interface WebViewProviderFactoryBoundaryInterface {
     /* SupportLibraryServiceWorkerController */ InvocationHandler getServiceWorkerController();
     /* SupportLibraryTracingController */ InvocationHandler getTracingController();
     /* SupportLibraryProxyController */ InvocationHandler getProxyController();
+    void setSupportLibraryVersion(String version);
 }

android_webview/support_library/boundary_interfaces/src/org/chromium/support_lib_boundary/util/Features.java

@@ -173,4 +173,7 @@ public class Features {
     // WebViewCompat.addWebMessageListener
     // WebViewCompat.removeWebMessageListener
     public static final String WEB_MESSAGE_LISTENER = "WEB_MESSAGE_LISTENER";
+
+    // WebViewProviderFactoryAdapter.setSupportLibraryVersion
+    public static final String SET_SUPPORT_LIBRARY_VERSION = "SET_SUPPORT_LIBRARY_VERSION";
 }

android_webview/support_library/java/src/org/chromium/support_lib_glue/SupportLibWebViewChromiumFactory.java

@@ -15,6 +15,7 @@ import com.android.webview.chromium.SharedTracingControllerAdapter;
 import com.android.webview.chromium.WebViewChromiumAwInit;
 import com.android.webview.chromium.WebkitToSharedGlueConverter;
 
+import org.chromium.android_webview.AwDebug;
 import org.chromium.support_lib_boundary.StaticsBoundaryInterface;
 import org.chromium.support_lib_boundary.WebViewProviderFactoryBoundaryInterface;
 import org.chromium.support_lib_boundary.util.BoundaryInterfaceReflectionUtil;
@@ -74,6 +75,7 @@ class SupportLibWebViewChromiumFactory implements WebViewProviderFactoryBoundary
                     Features.FORCE_DARK,
                     Features.FORCE_DARK_BEHAVIOR + Features.DEV_SUFFIX,
                     Features.WEB_MESSAGE_LISTENER + Features.DEV_SUFFIX,
+                    Features.SET_SUPPORT_LIBRARY_VERSION + Features.DEV_SUFFIX,
             };
     // clang-format on
 
@@ -182,4 +184,9 @@ class SupportLibWebViewChromiumFactory implements WebViewProviderFactoryBoundary
         }
         return mProxyController;
     }
+
+    @Override
+    public void setSupportLibraryVersion(String version) {
+        AwDebug.setSupportLibraryWebkitVersionCrashKey(version);
+    }
 }