Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 21fe5881 authored by uazo's avatar uazo Committed by GitHub
Browse files

[AUTO] Patches auto-rebase for next-146 branch (#2765) 

[AUTO] Patches auto-rebase for next-146 branch
parents d11d7002 0cb2f33e

build/patches/Add-AllowUserCertificates-flag.patch

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
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

@@ -201,6 +201,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

@@ -202,6 +202,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

     &feed::kFeedNoViewCache,

     &feed::kFeedPerformanceStudy,

     &feed::kFeedRecyclerBinderUnmountOnDetach,
@@ -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_PAGE_SUMMARY =

             "AdaptiveButtonInTopToolbarPageSummary";

     // Don't clean up this flag yet, BCIV is launched, so this needs to be enabled by

@@ -795,6 +796,8 @@ public abstract class ChromeFeatureList {

@@ -797,6 +798,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidWindowPopupResizeAfterSpawn =

             newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, false, true);

     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
@@ -68,7 +68,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final CachedFlag sAppSpecificHistoryViewIntent =

             newCachedFlag(APP_SPECIFIC_HISTORY_VIEW_INTENT, true);

     public static final CachedFlag sAsyncNotificationManager =

@@ -1129,6 +1132,7 @@ public abstract class ChromeFeatureList {

@@ -1131,6 +1134,7 @@ public abstract class ChromeFeatureList {

                     // keep-sorted start

                     sAccountForSuppressedKeyboardInsets,

                     sAndroidAnimatedProgressBarInBrowser,

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

+2 −2
Original line number Diff line number Diff line
@@ -1247,7 +1247,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

@@ -263,6 +263,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

@@ -264,6 +264,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

     &kAvoidDoubleMultiwindowChanges,

     &kBlockIntentsWhileLocked,

     &kBookmarkPaneAndroid,
@@ -1258,7 +1258,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

@@ -698,6 +698,7 @@ public abstract class ChromeFeatureList {

@@ -700,6 +700,7 @@ public abstract class ChromeFeatureList {

             "UseLibunwindstackNativeUnwinderAndroid";

     public static final String VERIFY_QWACS = "VerifyQWACs";

     public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService";

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

+8 −8
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 
 namespace about_flags {

 

 namespace {

@@ -4623,6 +4627,10 @@ const FeatureEntry::FeatureVariation

@@ -4645,6 +4649,10 @@ const FeatureEntry::FeatureVariation

         {"Mute Both", kPermissionsGestureGatedPromptsMuteBoth, nullptr},

 };
@@ -677,7 +677,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 
 // RECORDING USER METRICS FOR FLAGS:

 // -----------------------------------------------------------------------------

 // The first line of the entry is the internal name.

@@ -4649,6 +4657,9 @@ const FeatureEntry::FeatureVariation

@@ -4671,6 +4679,9 @@ const FeatureEntry::FeatureVariation

 const FeatureEntry kFeatureEntries[] = {

 // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and

 // //tools/flags/generate_unexpire_flags.py.
@@ -749,7 +749,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

@@ -818,6 +818,7 @@ BASE_FEATURE(kXplatSyncedSetup, base::FEATURE_DISABLED_BY_DEFAULT);

@@ -820,6 +820,7 @@ BASE_FEATURE(kXplatSyncedSetup, base::FEATURE_DISABLED_BY_DEFAULT);

 

 // clang-format on
@@ -782,7 +782,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
 import java.util.List;

 import java.util.Map;

 

@@ -1112,7 +1116,7 @@ public abstract class ChromeFeatureList {

@@ -1114,7 +1118,7 @@ public abstract class ChromeFeatureList {

             newCachedFlag(WEB_APK_MIN_SHELL_APK_VERSION, true);

     // keep-sorted end
@@ -791,7 +791,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
             List.of(

                     // keep-sorted start

                     sAccountForSuppressedKeyboardInsets,

@@ -1270,6 +1274,13 @@ public abstract class ChromeFeatureList {

@@ -1272,6 +1276,13 @@ public abstract class ChromeFeatureList {

                     // keep-sorted end

                     );
@@ -1012,7 +1012,7 @@ diff --git a/chrome/browser/unexpire_flags.cc b/chrome/browser/unexpire_flags.cc 
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc

--- a/chrome/common/chrome_features.cc

+++ b/chrome/common/chrome_features.cc

@@ -1973,5 +1973,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);

@@ -1985,5 +1985,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);

 // happen silently without prompting an updating dialog.

 BASE_FEATURE(kSilentPolicyAndDefaultAppUpdating,

              base::FEATURE_ENABLED_BY_DEFAULT);
@@ -2005,7 +2005,7 @@ new file mode 100755 
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc

--- a/media/base/media_switches.cc

+++ b/media/base/media_switches.cc

@@ -1826,5 +1826,5 @@ uint32_t GetPassthroughAudioFormats() {

@@ -1831,5 +1831,5 @@ uint32_t GetPassthroughAudioFormats() {

   return 0;

 #endif  // BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)

 }
@@ -2015,7 +2015,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc 
diff --git a/media/base/media_switches.h b/media/base/media_switches.h

--- a/media/base/media_switches.h

+++ b/media/base/media_switches.h

@@ -582,5 +582,5 @@ MEDIA_EXPORT bool IsOutOfProcessVideoDecodingEnabled();

@@ -586,5 +586,5 @@ MEDIA_EXPORT bool IsOutOfProcessVideoDecodingEnabled();

 MEDIA_EXPORT uint32_t GetPassthroughAudioFormats();

 

 }  // namespace media

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

+3 −3
Original line number Diff line number Diff line
@@ -851,7 +851,7 @@ diff --git a/content/browser/log_console_message.h b/content/browser/log_console 
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc

--- a/content/browser/renderer_host/render_frame_host_impl.cc

+++ b/content/browser/renderer_host/render_frame_host_impl.cc

@@ -322,6 +322,8 @@

@@ -323,6 +323,8 @@

 #include "url/origin.h"

 #include "url/url_constants.h"
@@ -860,7 +860,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b 
 #if BUILDFLAG(IS_ANDROID)

 #include "base/android/scoped_service_binding_batch.h"

 #include "content/browser/accessibility/browser_accessibility_manager_android.h"

@@ -4958,7 +4960,8 @@ void RenderFrameHostImpl::DidAddMessageToConsole(

@@ -4959,7 +4961,8 @@ void RenderFrameHostImpl::DidAddMessageToConsole(

   if (delegate_->DidAddMessageToConsole(this, log_level, message, line_no,

                                         updated_source_id,

                                         untrusted_stack_trace)) {
@@ -870,7 +870,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b 
   }

 

   // Pass through log severity only on builtin components pages to limit console

@@ -4975,8 +4978,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole(

@@ -4976,8 +4979,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole(

   const bool is_off_the_record =

       GetSiteInstance()->GetBrowserContext()->IsOffTheRecord();

build/patches/Add-custom-tab-intents-privacy-option.patch

+3 −3
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
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

@@ -703,7 +703,9 @@ BASE_FEATURE(kMagicStackAndroid, base::FEATURE_ENABLED_BY_DEFAULT);

@@ -705,7 +705,9 @@ BASE_FEATURE(kMagicStackAndroid, base::FEATURE_ENABLED_BY_DEFAULT);

 // Enables an experimental feature which forces mayLaunchUrl to use a different

 // storage partition. This may reduce performance. This should not be enabled by

 // default.
@@ -349,7 +349,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

@@ -975,6 +975,8 @@ public abstract class ChromeFeatureList {

@@ -977,6 +977,8 @@ public abstract class ChromeFeatureList {

                     MOST_VISITED_TILES_CUSTOMIZATION,

                     /* defaultValue= */ true,

                     /* defaultValueInTests= */ true);
@@ -358,7 +358,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final CachedFlag sMostVisitedTilesReselect =

             newCachedFlag(MOST_VISITED_TILES_RESELECT, false);

     public static final CachedFlag sMoveToFrontInLaunchIntentDispatcher =

@@ -1225,6 +1227,7 @@ public abstract class ChromeFeatureList {

@@ -1227,6 +1229,7 @@ public abstract class ChromeFeatureList {

                     sMaliciousApkDownloadCheck,

                     sMostVisitedTilesCustomization,

                     sMostVisitedTilesReselect,