Merge pull request #1004 from uazo/create-pull-request/patch-dcfc983

Git apply result for next-124 branch

build/patches/Enable-native-Android-autofill.patch

@@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../chromium/chrome/browser/tab/TabImpl.java  | 42 ++++++++++
  .../browser/tab/TabViewAndroidDelegate.java   |  4 +
  chrome/browser/BUILD.gn                       |  7 ++
- chrome/browser/android/tab_android.cc         |  9 +++
+ chrome/browser/android/tab_android.cc         |  8 ++
  .../strings/android_chrome_strings.grd        |  6 ++
  components/android_autofill/browser/BUILD.gn  |  1 +
  .../browser/android_autofill_manager.cc       |  2 +
@@ -41,7 +41,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../autofill/core/common/autofill_prefs.h     |  5 ++
  .../embedder_support/view/ContentView.java    | 47 +++++++++++
  .../chromium/ui/base/ViewAndroidDelegate.java |  4 +
- 26 files changed, 380 insertions(+), 3 deletions(-)
+ 26 files changed, 379 insertions(+), 3 deletions(-)
  create mode 100644 components/android_autofill/browser/java/src/org/chromium/components/autofill/BrowserSelectionActionMenuDelegate.java
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
@@ -303,11 +303,6 @@ diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_
    android_autofill::AndroidAutofillClient::CreateForWebContents(
        web_contents_.get(), [&](const JavaRef<jobject>& client) {});
  
-@@ -536,3 +544,4 @@ static void JNI_TabImpl_Init(JNIEnv* env,
-   // This will automatically bind to the Java object and pass ownership there.
-   new TabAndroid(env, obj, profile, id);
- }
-+
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

build/patches/Revert-remove-allowimage-content-setting-secondary-url.patch

@@ -3,7 +3,6 @@ Date: Sun, 14 Apr 2024 07:45:20 +0000
 Subject: Revert remove AllowImage content settings per secondary url
 
 https://chromium-review.googlesource.com/c/chromium/src/+/5308361
-
 ---
  .../renderer/content_settings_agent_impl.cc     | 17 +++++++++++++++++
  .../renderer/content_settings_agent_impl.h      |  2 ++

build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch

@@ -3,7 +3,6 @@ Date: Sun, 14 Apr 2024 07:35:57 +0000
 Subject: Revert remove AllowScript content settings per secondary url
 
 https://chromium-review.googlesource.com/c/chromium/src/+/5307559
-
 ---
  .../worker_content_settings_client.cc         | 30 +++++++++++++
  .../renderer/worker_content_settings_client.h |  2 +

build/patches/Temp-Alert-for-CC-revert.patch

@@ -3,7 +3,6 @@ Date: Sun, 14 Apr 2024 07:48:02 +0000
 Subject: Temp Alert content setting revert
 
 https://chromium-review.googlesource.com/c/chromium/src/+/5437554
-
 ---
  .../page_specific_content_settings_delegate.cc                | 4 ++--
  components/content_settings/core/common/content_settings.cc   | 2 +-