[AUTO] Patches auto-rebase for master branch (#1485)

[AUTO] Patches auto-rebase for master branch
uazo · Sep 18, 2024 · bbcb812 · bbcb812
2 parents 34d6ed1 + b804fce
commit bbcb812
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build/patches/Disable-media-router-and-remoting-by-default.patch b/build/patches/Disable-media-router-and-remoting-by-default.patch
@@ -15,15 +15,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
 --- a/chrome/browser/media/router/media_router_feature.cc
 +++ b/chrome/browser/media/router/media_router_feature.cc
-@@ -119,6 +119,7 @@ void ClearMediaRouterStoredPrefsForTesting() {
+@@ -123,6 +123,7 @@ void ClearMediaRouterStoredPrefsForTesting() {
  }
 
  bool MediaRouterEnabled(content::BrowserContext* context) {
 +  if ((true)) return false;
  #if !BUILDFLAG(IS_ANDROID)
    if (!base::FeatureList::IsEnabled(kMediaRouter))
      return false;
-@@ -161,7 +162,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -165,7 +166,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterStringPref(prefs::kMediaRouterReceiverIdHashToken, "",
                                 PrefRegistry::PUBLIC);
    registry->RegisterBooleanPref(
@@ -32,7 +32,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
    registry->RegisterBooleanPref(
        media_router::prefs::kMediaRouterShowCastSessionsStartedByOtherDevices,
        true);
-@@ -232,4 +233,7 @@ std::optional<base::TimeDelta> GetCastMirroringPlayoutDelay() {
+@@ -236,4 +237,7 @@ std::optional<base::TimeDelta> GetCastMirroringPlayoutDelay() {
 
  #endif  // !BUILDFLAG(IS_ANDROID)
 

diff --git a/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch b/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch
@@ -250,7 +250,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b
 diff --git a/third_party/blink/renderer/core/html/html_meta_element.cc b/third_party/blink/renderer/core/html/html_meta_element.cc
 --- a/third_party/blink/renderer/core/html/html_meta_element.cc
 +++ b/third_party/blink/renderer/core/html/html_meta_element.cc
-@@ -788,7 +788,9 @@ void HTMLMetaElement::ProcessMetaCH(Document& document,
+@@ -790,7 +790,9 @@ void HTMLMetaElement::ProcessMetaCH(Document& document,
      return;
    }