Change chromium version to 92.0.4515.38

README.md

@@ -108,7 +108,7 @@ See [the demo project](demo).
 
 # Chromium build information
 
-Current version is based on [`91.0.4472.70`](https://chromium.googlesource.com/chromium/src.git/+/refs/tags/91.0.4472.70)
+Current version is based on [`92.0.4515.38`](https://chromium.googlesource.com/chromium/src.git/+/refs/tags/92.0.4515.38)
 
 ## Customizing (Patch files are [here](patches))
 
@@ -197,7 +197,7 @@ $ sudo service iceccd restart
 ```sh
 $ cd ~/chromium/src
 
-$ git checkout tags/$VERSION # ex) tags/91.0.4472.70
+$ git checkout tags/$VERSION # ex) tags/92.0.4515.38
 
 $ gclient sync
 ```
@@ -222,7 +222,7 @@ $ ninja -C out/$TARGET webview_instrumentation_apk
 **IMPORTANT : It may be different depending on Chromium version.**
 
 ```sh
-$ node ~/chromium-aw/copy.js ~/chromium . # tested on 61 ~ 91.
+$ node ~/chromium-aw/copy.js ~/chromium . # tested on 61 ~ 92.
 ```
 
 5. Build

copy.js

@@ -126,6 +126,14 @@ const tasks = [
     ],
     dest: 'src/main/java/org/chromium/base',
   },
+  {
+    name: 'base/jank_tracker',
+    action: Action.COPY,
+    src: [
+      `src/out/${delegateTarget}/gen/base/base_java/generated_java/input_srcjars/org/chromium/base/jank_tracker`,
+    ],
+    dest: 'src/main/java/org/chromium/base/jank_tracker',
+  },
   {
     name: 'base/library_loader',
     action: Action.COPY,
@@ -281,6 +289,8 @@ const tasks = [
     name: 'components/autofill',
     action: Action.COPY,
     src: [
+      'src/components/android_autofill/android/java/src/org/chromium/components/autofill',
+      `src/out/${delegateTarget}/gen/components/android_autofill/android/java/generated_java/input_srcjars/org/chromium/components/autofill`,
       'src/components/autofill/android/java/src/org/chromium/components/autofill',
       'src/components/autofill/android/provider/java/src/org/chromium/components/autofill',
       'src/components/autofill/android/provider/src/org/chromium/components/autofill',
@@ -314,8 +324,10 @@ const tasks = [
     name: 'components/autofill_public',
     action: Action.COPY,
     src: [
+      'src/components/android_autofill/android/java/src/org/chromium/components/autofill_public',
       'src/components/autofill/android/provider/java/src/org/chromium/components/autofill_public',
       'src/components/autofill/android/provider/src/org/chromium/components/autofill_public',
+      `src/out/${delegateTarget}/gen/components/android_autofill/android/java/generated_java/input_srcjars/org/chromium/components/autofill_public`,
       `src/out/${delegateTarget}/gen/components/autofill/android/provider/java/generated_java/input_srcjars/org/chromium/components/autofill_public`,
     ],
     dest: 'src/main/java/org/chromium/components/autofill_public',
@@ -981,6 +993,7 @@ const tasks = [
           'RequestDestination.java',
           'RequestPriority.java',
           'SourceLocation.java',
+          'TimingAllowOrigin.java',
           'UrlLoader.java',
           'UrlLoader_Internal.java',
           'UrlLoaderClient.java',

src/main/java/org/chromium/android_webview/AndroidProtocolHandler.java

@@ -10,13 +10,10 @@
 import android.util.Log;
 import android.util.TypedValue;
 
-import androidx.annotation.IntDef;
-
 import org.chromium.base.ContextUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
-import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.url.GURL;
 
 import java.io.IOException;
@@ -96,40 +93,15 @@ private static Class<?> getClazz(String packageName, String assetType)
                 packageName + ".R$" + assetType);
     }
 
-    // These values are persisted to logs. Entries should not be renumbered and
-    // numeric values should never be reused.
-    @IntDef({FieldIdResult.GET_IDENTIFIER, FieldIdResult.REFLECTION,
-            FieldIdResult.RESOURCE_NOT_FOUND_ID_0, FieldIdResult.CLASS_NOT_FOUND_EXCEPTION,
-            FieldIdResult.NO_SUCH_FIELD_EXCEPTION, FieldIdResult.ILLEGAL_ACCESS_EXCEPTION,
-            FieldIdResult.COUNT})
-    private @interface FieldIdResult {
-        int GET_IDENTIFIER = 0;
-        int REFLECTION = 1;
-        int RESOURCE_NOT_FOUND_ID_0 = 2;
-        int CLASS_NOT_FOUND_EXCEPTION = 3;
-        int NO_SUCH_FIELD_EXCEPTION = 4;
-        int ILLEGAL_ACCESS_EXCEPTION = 5;
-        int COUNT = 6;
-    }
-
-    private static void recordFieldIdResultHistogram(@FieldIdResult int histogram) {
-        RecordHistogram.recordEnumeratedHistogram(
-                "Android.WebView.AndroidProtocolHandler.ResourceGetIdentifier2", histogram,
-                FieldIdResult.COUNT);
-    }
-
     private static int getFieldId(String assetType, String assetName)
             throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
         Context appContext = ContextUtils.getApplicationContext();
         String packageName = appContext.getPackageName();
         int id = appContext.getResources().getIdentifier(assetName, assetType, packageName);
         if (id != 0) {
-            recordFieldIdResultHistogram(FieldIdResult.GET_IDENTIFIER);
             return id;
         }
-        // Keep trying getting resource id by reflection to make sure results make sense.
-        // TODO(https://crbug.com/923956) remove reflection if the histogram doesn't hit
-        // REFLECTION
+        // Fail back to reflection if getIdentifier fails, see https://crbug.com/923956.
         Class<?> clazz = null;
         try {
             clazz = getClazz(packageName, assetType);
@@ -150,13 +122,6 @@ private static int getFieldId(String assetType, String assetName)
         java.lang.reflect.Field field = clazz.getField(assetName);
         id = field.getInt(null);
 
-        // Although id shouldn't be zero if no exception is thrown but still record the case if it
-        // happens.
-        if (id == 0) {
-            recordFieldIdResultHistogram(FieldIdResult.RESOURCE_NOT_FOUND_ID_0);
-        } else {
-            recordFieldIdResultHistogram(FieldIdResult.REFLECTION);
-        }
         return id;
     }
 
@@ -200,14 +165,11 @@ private static InputStream openResource(Uri uri) {
             }
         } catch (ClassNotFoundException e) {
             Log.e(TAG, "Unable to open resource URL: " + uri, e);
-            recordFieldIdResultHistogram(FieldIdResult.CLASS_NOT_FOUND_EXCEPTION);
             return null;
         } catch (NoSuchFieldException e) {
             Log.e(TAG, "Unable to open resource URL: " + uri, e);
-            recordFieldIdResultHistogram(FieldIdResult.NO_SUCH_FIELD_EXCEPTION);
             return null;
         } catch (IllegalAccessException e) {
-            recordFieldIdResultHistogram(FieldIdResult.ILLEGAL_ACCESS_EXCEPTION);
             Log.e(TAG, "Unable to open resource URL: " + uri, e);
             return null;
         }