Git apply result for master branch

build/patches/Add-AllowUserCertificates-flag.patch

@@ -59,7 +59,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_TRANSLATE =
              "AdaptiveButtonInTopToolbarTranslate";
      public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_ADD_TO_BOOKMARKS =
-@@ -521,6 +522,8 @@ public abstract class ChromeFeatureList {
+@@ -523,6 +524,8 @@ public abstract class ChromeFeatureList {
              newCachedFlag(ANDROID_ELEGANT_TEXT_HEIGHT, false);
 
      public static final CachedFlag sAndroidHub = newCachedFlag(ANDROID_HUB, false);
@@ -68,7 +68,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final CachedFlag sArchiveTabService = newCachedFlag(ARCHIVE_TAB_SERVICE, false);
      public static final CachedFlag sBackGestureActivityTabProvider =
              newCachedFlag(BACK_GESTURE_ACTIVITY_TAB_PROVIDER, false);
-@@ -655,6 +658,7 @@ public abstract class ChromeFeatureList {
+@@ -657,6 +660,7 @@ public abstract class ChromeFeatureList {
 
      public static final List<CachedFlag> sFlagsCachedFullBrowser =
              List.of(

build/patches/Add-bookmark-import-export-actions.patch

@@ -1371,7 +1371,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -176,6 +176,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -177,6 +177,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kCacheActivityTaskID,
      &kCastDeviceFilter,
      &kClearOmniboxFocusAfterNavigation,
@@ -1382,7 +1382,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -492,6 +492,7 @@ public abstract class ChromeFeatureList {
+@@ -494,6 +494,7 @@ public abstract class ChromeFeatureList {
      public static final String USER_BYPASS_UI = "UserBypassUI";
      public static final String VERTICAL_AUTOMOTIVE_BACK_BUTTON_TOOLBAR =
              "VerticalAutomotiveBackButtonToolbar";

build/patches/Add-cromite-flags-support.patch

@@ -621,7 +621,7 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -1013,5 +1013,6 @@ BASE_FEATURE(kWebApkBackupAndRestoreBackend,
+@@ -1018,5 +1018,6 @@ BASE_FEATURE(kWebApkBackupAndRestoreBackend,
               "WebApkBackupAndRestoreBackend",
               base::FEATURE_DISABLED_BY_DEFAULT);
 
@@ -631,7 +631,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
 --- a/chrome/browser/flags/android/chrome_feature_list.h
 +++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -195,6 +195,7 @@ constexpr base::FeatureParam<int> kAuxiliarySearchMaxTabsCountParam(
+@@ -196,6 +196,7 @@ constexpr base::FeatureParam<int> kAuxiliarySearchMaxTabsCountParam(
      "auxiliary_search_max_donation_tab",
      100);
 
@@ -653,7 +653,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
  import java.util.List;
  import java.util.Map;
 
-@@ -667,7 +671,7 @@ public abstract class ChromeFeatureList {
+@@ -669,7 +673,7 @@ public abstract class ChromeFeatureList {
      public static final CachedFlag sVerticalAutomotiveBackButtonToolbar =
              newCachedFlag(VERTICAL_AUTOMOTIVE_BACK_BUTTON_TOOLBAR, false);
 
@@ -662,7 +662,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
              List.of(
                      sAllowUserCertificates,
                      sAndroidAppIntegration,
-@@ -748,6 +752,13 @@ public abstract class ChromeFeatureList {
+@@ -750,6 +754,13 @@ public abstract class ChromeFeatureList {
                      sUseLibunwindstackNativeUnwinderAndroid,
                      sVerticalAutomotiveBackButtonToolbar);
 

build/patches/Add-setting-to-invert-tap-and-long-tap.patch

@@ -158,7 +158,7 @@ diff --git a/chrome/browser/contextmenu/java/src/org/chromium/chrome/browser/con
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -288,6 +288,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -289,6 +289,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kTabGroupParityAndroid,
      &kTabletTabSwitcherLongPressMenu,
      &kTabletToolbarIncognitoStatus,
@@ -169,7 +169,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -337,6 +337,8 @@ public abstract class ChromeFeatureList {
+@@ -339,6 +339,8 @@ public abstract class ChromeFeatureList {
      public static final String NEW_TAB_SEARCH_ENGINE_URL_ANDROID = "NewTabSearchEngineUrlAndroid";
      public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM =
              "MoveTopToolbarToBottom";
@@ -178,7 +178,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
      public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET =
              "NotificationPermissionBottomSheet";
-@@ -605,6 +607,8 @@ public abstract class ChromeFeatureList {
+@@ -607,6 +609,8 @@ public abstract class ChromeFeatureList {
              newCachedFlag(OMNIBOX_MATCH_TOOLBAR_AND_STATUS_BAR_COLOR, false);
      public static final CachedFlag sMoveTopToolbarToBottom =
              newCachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false);
@@ -187,7 +187,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final CachedFlag sOmniboxModernizeVisualUpdate =
              newCachedFlag(OMNIBOX_MODERNIZE_VISUAL_UPDATE, true);
      public static final CachedFlag sOptimizationGuidePushNotifications =
-@@ -740,6 +744,7 @@ public abstract class ChromeFeatureList {
+@@ -742,6 +746,7 @@ public abstract class ChromeFeatureList {
                      sTabWindowManagerReportIndicesMismatch,
                      sToolbarUseHardwareBitmapDraw,
                      sUseChimeAndroidSdk,

build/patches/Bromite-auto-updater.patch

@@ -1612,7 +1612,7 @@ new file mode 100644
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -234,6 +234,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -235,6 +235,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kPreconnectOnTabCreation,
      &kPriceChangeModule,
      &kPwaRestoreUi,
@@ -1623,7 +1623,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -313,6 +313,7 @@ public abstract class ChromeFeatureList {
+@@ -315,6 +315,7 @@ public abstract class ChromeFeatureList {
              "IncognitoReauthenticationForAndroid";
      public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot";
      public static final String INSTANT_START = "InstantStart";

build/patches/Dictionary-suggestions-for-the-Omnibox.patch

@@ -66,7 +66,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
      private boolean mPendingScroll;
 
      // Captures the current intended text scroll type.
-@@ -299,6 +301,27 @@ public abstract class UrlBar extends AutocompleteEditText {
+@@ -300,6 +302,27 @@ public abstract class UrlBar extends AutocompleteEditText {
              mPendingScroll = false;
          }
          fixupTextDirection();

build/patches/Disable-StartSurface-feature.patch

@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -620,7 +620,7 @@ public abstract class ChromeFeatureList {
+@@ -622,7 +622,7 @@ public abstract class ChromeFeatureList {
      public static final CachedFlag sSmallerTabStripTitleLimit =
              newCachedFlag(SMALLER_TAB_STRIP_TITLE_LIMIT, false);
      public static final CachedFlag sStartSurfaceAndroid =

build/patches/Disable-smart-selection-by-default.patch

@@ -44,7 +44,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearc
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -183,6 +183,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -184,6 +184,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kCCTEmbedderSpecialBehaviorTrigger,
      &kCCTExtendTrustedCdnPublisher,
      &kCCTFeatureUsage,
@@ -55,7 +55,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -218,6 +218,7 @@ public abstract class ChromeFeatureList {
+@@ -220,6 +220,7 @@ public abstract class ChromeFeatureList {
      public static final String CCT_MINIMIZED_ENABLED_BY_DEFAULT = "CCTMinimizedEnabledByDefault";
      public static final String CCT_INTENT_FEATURE_OVERRIDES = "CCTIntentFeatureOverrides";
      public static final String CCT_PAGE_INSIGHTS_HUB = "CCTPageInsightsHub";

build/patches/Enable-ImprovedBookmarks-by-default.patch

@@ -82,7 +82,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -766,7 +766,7 @@ public abstract class ChromeFeatureList {
+@@ -768,7 +768,7 @@ public abstract class ChromeFeatureList {
      public static final MutableFlagWithSafeDefault sAdvancedPeripheralsSupportTabStrip =
              newMutableFlagWithSafeDefault(ADVANCED_PERIPHERALS_SUPPORT_TAB_STRIP, true);
      public static final MutableFlagWithSafeDefault sAndroidImprovedBookmarks =

build/patches/Enable-share-intent.patch

@@ -468,7 +468,7 @@ new file mode 100644
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -254,6 +254,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -255,6 +255,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kReengagementNotification,
      &kSearchReadyOmniboxFeature,
      &kRelatedSearchesAllLanguage,
@@ -479,7 +479,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -400,6 +400,7 @@ public abstract class ChromeFeatureList {
+@@ -402,6 +402,7 @@ public abstract class ChromeFeatureList {
      public static final String READALOUD_IN_MULTI_WINDOW = "ReadAloudInMultiWindow";
      public static final String READALOUD_PLAYBACK = "ReadAloudPlayback";
      public static final String READER_MODE_IN_CCT = "ReaderModeInCCT";

build/patches/Keep-Side-Panel-Companion-disabled.patch

@@ -49,7 +49,7 @@ diff --git a/chrome/browser/ui/side_search/side_search_prefs.cc b/chrome/browser
 diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
 --- a/components/search_engines/template_url.cc
 +++ b/components/search_engines/template_url.cc
-@@ -1852,7 +1852,7 @@ GURL TemplateURL::GenerateSuggestionURL(
+@@ -1858,7 +1858,7 @@ GURL TemplateURL::GenerateSuggestionURL(
  }
 
  bool TemplateURL::IsSideSearchSupported() const {

build/patches/Move-navigation-bar-to-bottom.patch

@@ -1880,7 +1880,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
  #include "chrome/browser/browser_features.h"
  #include "chrome/browser/feature_guide/notifications/feature_notification_guide_service.h"
  #include "chrome/browser/flags/android/chrome_session_state.h"
-@@ -230,6 +231,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -231,6 +232,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kMagicStackAndroid,
      &kMultiInstanceApplicationStatusCleanup,
      &kNewTabSearchEngineUrlAndroid,
@@ -1891,7 +1891,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -334,6 +334,8 @@ public abstract class ChromeFeatureList {
+@@ -336,6 +336,8 @@ public abstract class ChromeFeatureList {
      public static final String MUlTI_INSTANCE_APPLICATION_STATUS_CLEANUP =
              "MultiInstanceApplicationStatusCleanup";
      public static final String NEW_TAB_SEARCH_ENGINE_URL_ANDROID = "NewTabSearchEngineUrlAndroid";
@@ -1900,7 +1900,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
      public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET =
              "NotificationPermissionBottomSheet";
-@@ -600,6 +602,8 @@ public abstract class ChromeFeatureList {
+@@ -602,6 +604,8 @@ public abstract class ChromeFeatureList {
              newCachedFlag(QUERY_TILES_IN_ZPS_ON_NTP, false);
      public static final CachedFlag sOmniboxMatchToolbarAndStatusBarColor =
              newCachedFlag(OMNIBOX_MATCH_TOOLBAR_AND_STATUS_BAR_COLOR, false);
@@ -1909,7 +1909,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final CachedFlag sOmniboxModernizeVisualUpdate =
              newCachedFlag(OMNIBOX_MODERNIZE_VISUAL_UPDATE, true);
      public static final CachedFlag sOptimizationGuidePushNotifications =
-@@ -709,6 +713,7 @@ public abstract class ChromeFeatureList {
+@@ -711,6 +715,7 @@ public abstract class ChromeFeatureList {
                      sOmniboxMatchToolbarAndStatusBarColor,
                      sOmniboxModernizeVisualUpdate,
                      sOptimizationGuidePushNotifications,

build/patches/Multiple-fingerprinting-mitigations.patch

@@ -104,7 +104,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
  #if BUILDFLAG(IS_ANDROID)
  #include "base/android/child_process_binding_types.h"
  #include "content/browser/android/java_interfaces_impl.h"
-@@ -3411,6 +3412,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3420,6 +3421,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
      switches::kDisableBreakpad,
      switches::kDisableDatabases,
      switches::kDisableFileSystem,

build/patches/Override-Navigator-Language.patch

@@ -60,7 +60,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
  #include "components/metrics/single_sample_metrics.h"
  #include "components/services/storage/privileged/mojom/indexed_db_control.mojom.h"
  #include "components/services/storage/public/cpp/buckets/bucket_id.h"
-@@ -3329,8 +3330,11 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
+@@ -3332,8 +3333,11 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
    PropagateBrowserCommandLineToRenderer(browser_command_line, command_line);
 
    // Pass on the browser locale.

build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch

@@ -45,7 +45,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -171,6 +171,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -172,6 +172,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kBackGestureActivityTabProvider,
      &kBackGestureMoveToBackDuringStartup,
      &kBackGestureRefactorAndroid,
@@ -56,7 +56,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -223,6 +223,7 @@ public abstract class ChromeFeatureList {
+@@ -225,6 +225,7 @@ public abstract class ChromeFeatureList {
              "CCTPageInsightsHubBetterScroll";
      public static final String CCT_REPORT_PARALLEL_REQUEST_STATUS =
              "CCTReportParallelRequestStatus";