v139 develop to main

.gitmodules

@@ -41,10 +41,6 @@
 [submodule "chrome/test/data/xr/webvr_info"]
 	path = chrome/test/data/xr/webvr_info
 	url = https://chromium.googlesource.com/external/github.com/toji/webvr.info
-[submodule "clank"]
-	path = clank
-	url = https://chrome-internal.googlesource.com/clank/internal/apps
-	gclient-condition = checkout_android and checkout_src_internal
 [submodule "docs/website"]
 	path = docs/website
 	url = https://chromium.googlesource.com/website
@@ -646,10 +642,6 @@
 [submodule "v8"]
 	path = v8
 	url = https://chromium.googlesource.com/v8/v8
-[submodule "internal"]
-	path = internal
-	url = https://chrome-internal.googlesource.com/chrome/src-internal
-	gclient-condition = checkout_src_internal or checkout_src_internal_infra
 [submodule "third_party/android_prebuilts/build_tools"]
 	path = third_party/android_prebuilts/build_tools
 	url = https://android.googlesource.com/platform/prebuilts/build-tools
@@ -834,10 +826,6 @@
 	path = google_apis/internal
 	url = https://chrome-internal.googlesource.com/chrome/google_apis/internal
 	gclient-condition = checkout_src_internal
-[submodule "ios_internal"]
-	path = ios_internal
-	url = https://chrome-internal.googlesource.com/chrome/ios_internal
-	gclient-condition = checkout_ios and checkout_src_internal
 [submodule "remoting/host/installer/linux/internal"]
 	path = remoting/host/installer/linux/internal
 	url = https://chrome-internal.googlesource.com/chrome/remoting/host/installer/linux/internal

BUILD.gn

@@ -490,7 +490,7 @@ group("gn_all") {
         "//net:disk_cache_memory_test",
         "//net:quic_client",
         "//net:quic_server",
-        "//sandbox/linux:chrome_sandbox",
+        "//sandbox/linux:taktak_sandbox",
         "//sandbox/linux:sandbox_linux_unittests",
       ]
       if (!is_clang) {
@@ -1042,7 +1042,7 @@ if (is_chromeos) {
       "//components/policy/test_support:fake_dmserver",
       "//media:media_unittests",
       "//media/capture:capture_unittests",
-      "//sandbox/linux:chrome_sandbox",
+      "//sandbox/linux:taktak_sandbox",
       "//sandbox/linux:sandbox_linux_unittests",
       "//services/screen_ai:screen_ai_ocr_perf_test",
       "//third_party/breakpad:minidump_stackwalk($host_system_allocator_toolchain)",

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

@@ -19,8 +19,8 @@
 import org.chromium.base.TraceEvent;
 
 /**
- * Type adaptation layer between {@link android.webkit.WebSettings} and
- * {@link org.chromium.android_webview.AwSettings}.
+ * Type adaptation layer between {@link android.webkit.WebSettings} and {@link
+ * org.chromium.android_webview.AwSettings}.
  */
 @SuppressWarnings({"deprecation", "NoSynchronizedMethodCheck"})
 public class ContentSettingsAdapter extends android.webkit.WebSettings {

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

@@ -12,8 +12,8 @@
 import org.chromium.components.embedder_support.util.WebResourceResponseInfo;
 
 /**
- * An adapter class that forwards the callbacks from {@link AwServiceWorkerClient}
- * to the corresponding {@link ServiceWorkerClient}.
+ * An adapter class that forwards the callbacks from {@link AwServiceWorkerClient} to the
+ * corresponding {@link ServiceWorkerClient}.
  */
 public class ServiceWorkerClientAdapter extends AwServiceWorkerClient {
     private final ServiceWorkerClient mServiceWorkerClient;

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

@@ -13,8 +13,8 @@
 import org.chromium.android_webview.AwServiceWorkerController;
 
 /**
- * Chromium implementation of ServiceWorkerController -- forwards calls to
- * the chromium internal implementation.
+ * Chromium implementation of ServiceWorkerController -- forwards calls to the chromium internal
+ * implementation.
  */
 public class ServiceWorkerControllerAdapter extends ServiceWorkerController {
     private final AwServiceWorkerController mAwServiceWorkerController;

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

@@ -7,8 +7,8 @@
 import org.chromium.android_webview.AwServiceWorkerSettings;
 
 /**
- * Type adaptation layer between {@link android.webkit.ServiceWorkerWebSettings}
- * and {@link org.chromium.android_webview.AwServiceWorkerSettings}.
+ * Type adaptation layer between {@link android.webkit.ServiceWorkerWebSettings} and {@link
+ * org.chromium.android_webview.AwServiceWorkerSettings}.
  */
 @SuppressWarnings("NoSynchronizedMethodCheck")
 public class ServiceWorkerSettingsAdapter extends android.webkit.ServiceWorkerWebSettings {

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

@@ -11,10 +11,7 @@
 import org.chromium.content_public.browser.MessagePayload;
 import org.chromium.content_public.browser.MessagePort;
 
-/**
- * This class is used to convert a WebMessagePort to a MessagePort in chromium
- * world.
- */
+/** This class is used to convert a WebMessagePort to a MessagePort in chromium world. */
 public class WebMessagePortAdapter extends WebMessagePort {
     private final MessagePort mPort;
 

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

@@ -2660,7 +2660,9 @@ public boolean overlayVerticalScrollbar() {
         return mOverlayVerticalScrollbar;
     }
 
-    /** @see android.webkit.WebView#requestChildRectangleOnScreen(View, Rect, boolean) */
+    /**
+     * @see android.webkit.WebView#requestChildRectangleOnScreen(View, Rect, boolean)
+     */
     public boolean requestChildRectangleOnScreen(View child, Rect rect, boolean immediate) {
         if (isDestroyed(WARN)) return false;
         return mScrollOffsetManager.requestChildRectangleOnScreen(
@@ -2670,7 +2672,9 @@ public boolean requestChildRectangleOnScreen(View child, Rect rect, boolean imme
                 immediate);
     }
 
-    /** @see android.webkit.WebView#stopLoading() */
+    /**
+     * @see android.webkit.WebView#stopLoading()
+     */
     public void stopLoading() {
         if (TRACE) Log.i(TAG, "%s stopLoading", this);
         if (!isDestroyed(WARN)) mWebContents.stop();

android_webview/java/src/org/chromium/android_webview/AwNavigationParams.java

@@ -4,8 +4,6 @@
 
 package org.chromium.android_webview;
 
-
-
 /**
  * Parameters to {@link AwContents#navigate}.
  *

android_webview/java/src/org/chromium/android_webview/AwPacProcessor.java

@@ -25,8 +25,8 @@
 import java.util.List;
 
 /**
- * Class to evaluate PAC scripts. Its lifecycle is independent of
- * any Renderer, Profile, or WebView instance.
+ * Class to evaluate PAC scripts. Its lifecycle is independent of any Renderer, Profile, or WebView
+ * instance.
  */
 @JNINamespace("android_webview")
 @RequiresApi(Build.VERSION_CODES.P)

android_webview/java/src/org/chromium/android_webview/AwPrintDocumentAdapter.java

@@ -15,9 +15,8 @@
 import java.util.ArrayList;
 
 /**
- * Adapter for printing Webview. This class implements the abstract
- * system class PrintDocumentAdapter and hides all printing details from
- * the developer.
+ * Adapter for printing Webview. This class implements the abstract system class
+ * PrintDocumentAdapter and hides all printing details from the developer.
  */
 public class AwPrintDocumentAdapter extends PrintDocumentAdapter {
 
@@ -26,8 +25,7 @@ public class AwPrintDocumentAdapter extends PrintDocumentAdapter {
     private final String mDocumentName;
 
     /**
-     * Constructor.
-     * TODO(sgurun) remove in favor of constructor below once the AOSP changes are in.
+     * Constructor. TODO(sgurun) remove in favor of constructor below once the AOSP changes are in.
      *
      * @param pdfExporter The PDF exporter to export the webview contents to a PDF file.
      */

android_webview/java/src/org/chromium/android_webview/AwViewMethods.java

@@ -105,7 +105,9 @@ public interface AwViewMethods {
     /** @see android.view.View#computeVerticalScrollExtent */
     int computeVerticalScrollExtent();
 
-    /** @see android.view.View#computeScroll */
+    /**
+     * @see android.view.View#computeScroll
+     */
     void computeScroll();
 
     /**
@@ -122,12 +124,18 @@ public interface AwViewMethods {
      */
     AccessibilityNodeProvider getAccessibilityNodeProvider();
 
-    /** @see android.view.View#performAccessibilityAction */
+    /**
+     * @see android.view.View#performAccessibilityAction
+     */
     boolean performAccessibilityAction(final int action, final Bundle arguments);
 
-    /** @see android.view.View#onStartTemporaryDetach() */
+    /**
+     * @see android.view.View#onStartTemporaryDetach()
+     */
     void onStartTemporaryDetach();
 
-    /** @see android.view.View#onFinishTemporaryDetach() */
+    /**
+     * @see android.view.View#onFinishTemporaryDetach()
+     */
     void onFinishTemporaryDetach();
 }

android_webview/java/src/org/chromium/android_webview/AwWebContentsMetricsRecorder.java

@@ -22,9 +22,9 @@
 /**
  * This class records WebView settings usage.
  *
- * It records histograms at navigationEntryCommitted to show what the settings were on navigation.
- * It also offers static helpers to record the settings as they are configured by the embedding
- * application.
+ * <p>It records histograms at navigationEntryCommitted to show what the settings were on
+ * navigation. It also offers static helpers to record the settings as they are configured by the
+ * embedding application.
  */
 @Lifetime.WebView
 public class AwWebContentsMetricsRecorder extends WebContentsObserver {

android_webview/java/src/org/chromium/android_webview/CleanupReference.java

@@ -124,8 +124,7 @@ public void handleMessage(Message msg) {
     }
 
     /**
-     * Keep a strong reference to {@link CleanupReference} so that it will
-     * actually get enqueued.
+     * Keep a strong reference to {@link CleanupReference} so that it will actually get enqueued.
      * Only accessed on the UI thread.
      */
     private static final Set<CleanupReference> sRefs = new HashSet<CleanupReference>();

android_webview/java/src/org/chromium/android_webview/NullAwViewMethods.java

@@ -20,9 +20,9 @@
 import org.chromium.android_webview.AwContents.InternalAccessDelegate;
 
 /**
- * No-op implementation of {@link AwViewMethods} that follows the null object pattern.
- * This {@link NullAwViewMethods} is hooked up to the WebView in fullscreen mode, and
- * to the {@link FullScreenView} in embedded mode, but not to both at the same time.
+ * No-op implementation of {@link AwViewMethods} that follows the null object pattern. This {@link
+ * NullAwViewMethods} is hooked up to the WebView in fullscreen mode, and to the {@link
+ * FullScreenView} in embedded mode, but not to both at the same time.
  */
 class NullAwViewMethods implements AwViewMethods {
     private final AwContents mAwContents;

android_webview/java/src/org/chromium/android_webview/variations/VariationsSeedLoader.java

@@ -55,26 +55,22 @@
  * block on loading the seed (by using FutureTask.get()) but should not block on the other work done
  * by the Runnable.
  *
- * The Runnable and FutureTask together perform these steps:
- * 1. Pre-load the metrics client ID. This is needed to seed the EntropyProvider. If there is no
- *    client ID, variations can't be used on this run.
- * 2. Load the new seed file, if any.
- * 3. If no new seed file, load the old seed file, if any.
- * 4. Make the loaded seed available via get() (or null if there was no seed).
- * 5. If there was a new seed file, replace the old with the new (but only after making the loaded
- *    seed available, as the replace need not block startup).
- * 6. If there was no seed, or the loaded seed was expired, request a new seed (but don't request
- *    more often than MAX_REQUEST_PERIOD_MILLIS).
+ * <p>The Runnable and FutureTask together perform these steps: 1. Pre-load the metrics client ID.
+ * This is needed to seed the EntropyProvider. If there is no client ID, variations can't be used on
+ * this run. 2. Load the new seed file, if any. 3. If no new seed file, load the old seed file, if
+ * any. 4. Make the loaded seed available via get() (or null if there was no seed). 5. If there was
+ * a new seed file, replace the old with the new (but only after making the loaded seed available,
+ * as the replace need not block startup). 6. If there was no seed, or the loaded seed was expired,
+ * request a new seed (but don't request more often than MAX_REQUEST_PERIOD_MILLIS).
  *
- * VariationsSeedLoader should be used during WebView startup like so:
- * 1. Ensure ContextUtils.getApplicationContext(), AwBrowserProcess.getWebViewPackageName(), and
- *    PathUtils are ready to use.
- * 2. As early as possible, call startVariationsInit() to begin the task.
- * 3. Perform any WebView startup tasks which don't require variations to be initialized.
- * 4. Call finishVariationsInit() with the value returned from startVariationsInit(). This will
- *    block for up to SEED_LOAD_TIMEOUT_MILLIS if the task hasn't fininshed loading the seed. If the
- *    seed is loaded on time, variations will be initialized. finishVariationsInit() must be called
- *    before AwFeatureListCreator::SetUpFieldTrials() runs.
+ * <p>VariationsSeedLoader should be used during WebView startup like so: 1. Ensure
+ * ContextUtils.getApplicationContext(), AwBrowserProcess.getWebViewPackageName(), and PathUtils are
+ * ready to use. 2. As early as possible, call startVariationsInit() to begin the task. 3. Perform
+ * any WebView startup tasks which don't require variations to be initialized. 4. Call
+ * finishVariationsInit() with the value returned from startVariationsInit(). This will block for up
+ * to SEED_LOAD_TIMEOUT_MILLIS if the task hasn't fininshed loading the seed. If the seed is loaded
+ * on time, variations will be initialized. finishVariationsInit() must be called before
+ * AwFeatureListCreator::SetUpFieldTrials() runs.
  */
 @JNINamespace("android_webview")
 @NullMarked

android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnRendererUnresponsiveTest.java

@@ -22,11 +22,11 @@
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwRenderProcess;
 import org.chromium.android_webview.AwRenderProcessGoneDetail;
+import org.chromium.base.ThreadUtils;
 import org.chromium.base.task.PostTask;
 import org.chromium.base.task.TaskTraits;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.Feature;
-import org.chromium.base.ThreadUtils;
 import org.chromium.content_public.browser.test.util.WebContentsUtils;
 import org.chromium.content_public.common.ContentUrlConstants;
 

android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java

@@ -33,13 +33,13 @@
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.android_webview.test.util.CookieUtils;
 import org.chromium.android_webview.test.util.JSUtils;
+import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Batch;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.HistogramWatcher;
 import org.chromium.base.test.util.TestFileUtil;
-import org.chromium.base.ThreadUtils;
 import org.chromium.components.embedder_support.util.WebResourceResponseInfo;
 import org.chromium.content_public.browser.test.util.WebContentsUtils;
 import org.chromium.net.test.util.TestWebServer;

android_webview/javatests/src/org/chromium/android_webview/test/AwServiceWorkerClientTest.java

@@ -4,7 +4,6 @@
 
 package org.chromium.android_webview.test;
 
-
 import androidx.test.filters.SmallTest;
 
 import org.junit.After;

android_webview/javatests/src/org/chromium/android_webview/test/services/MockVariationsSeedServer.java

@@ -16,9 +16,9 @@
 import org.chromium.base.test.util.CallbackHelper;
 
 /**
- * VariationsSeedServer is a bound service that shares the Variations seed with all the WebViews
- * on the system. A WebView will bind and call getSeed, passing a file descriptor to which the
- * service should write the seed.
+ * VariationsSeedServer is a bound service that shares the Variations seed with all the WebViews on
+ * the system. A WebView will bind and call getSeed, passing a file descriptor to which the service
+ * should write the seed.
  */
 public class MockVariationsSeedServer extends VariationsSeedServer {
     private static final CallbackHelper sOnSeedRequested = new CallbackHelper();

android_webview/junit/src/org/chromium/android_webview/robolectric/WebViewCachedFlagsTest.java

@@ -8,11 +8,11 @@
 
 import com.android.webview.chromium.WebViewCachedFlags;
 
-import org.chromium.android_webview.common.AwFeatures;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.chromium.android_webview.common.AwFeatures;
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.Features;

android_webview/nonembedded/java/src/org/chromium/android_webview/devui/util/UnuploadedFilesStateLoader.java

@@ -13,14 +13,16 @@
 import java.util.List;
 
 /**
- * Gets crashes info about unuploaded minidump files in crash directory.
- * Minidump file name contains information about the upload state of the file, its local id and
- * number of trials of upload for that report.
+ * Gets crashes info about unuploaded minidump files in crash directory. Minidump file name contains
+ * information about the upload state of the file, its local id and number of trials of upload for
+ * that report.
  */
 public class UnuploadedFilesStateLoader extends CrashInfoLoader {
     private final CrashFileManager mCrashFileManager;
 
-    /** @param crashDir the directory where WebView stores crash reports files. */
+    /**
+     * @param crashDir the directory where WebView stores crash reports files.
+     */
     public UnuploadedFilesStateLoader(CrashFileManager crashFileManager) {
         mCrashFileManager = crashFileManager;
     }

android_webview/nonembedded/java/src/org/chromium/android_webview/devui/util/UploadedCrashesInfoLoader.java

@@ -18,7 +18,9 @@
 public class UploadedCrashesInfoLoader extends CrashInfoLoader {
     private final File mLogFile;
 
-    /** @param logsFile upload log file to parse. */
+    /**
+     * @param logsFile upload log file to parse.
+     */
     public UploadedCrashesInfoLoader(File logFile) {
         mLogFile = logFile;
     }

android_webview/nonembedded/java/src/org/chromium/android_webview/devui/util/WebViewCrashLogParser.java

@@ -28,7 +28,9 @@ public class WebViewCrashLogParser extends CrashInfoLoader {
 
     private final File mLogDir;
 
-    /** @param logDir the directory where WebView store crash logs. */
+    /**
+     * @param logDir the directory where WebView store crash logs.
+     */
     public WebViewCrashLogParser(File logDir) {
         mLogDir = logDir;
     }