Skip to content

Commit eae1e04

Browse files
authored
[AUTO] Patches auto-rebase for master branch (#1634)
[AUTO] Patches auto-rebase for master branch
2 parents ae4c9e5 + 2196eb9 commit eae1e04

3 files changed

+6
-4
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ new file mode 100644
951951
diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc
952952
--- a/chrome/browser/ui/ui_features.cc
953953
+++ b/chrome/browser/ui/ui_features.cc
954-
@@ -479,4 +479,5 @@ BASE_FEATURE(kPageSpecificDataDialogRelatedInstalledAppsSection,
954+
@@ -486,4 +486,5 @@ BASE_FEATURE(kPageSpecificDataDialogRelatedInstalledAppsSection,
955955
"PageSpecificDataDialogRelatedInstalledAppsSection",
956956
base::FEATURE_DISABLED_BY_DEFAULT);
957957

build/patches/Keep-Manta-Service-Disabled.patch

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ Subject: Keep Manta Service Disabled
99
diff --git a/components/manta/features.cc b/components/manta/features.cc
1010
--- a/components/manta/features.cc
1111
+++ b/components/manta/features.cc
12-
@@ -9,11 +9,13 @@
12+
@@ -9,6 +9,7 @@
1313
namespace manta::features {
1414

1515
BASE_FEATURE(kMantaService, "MantaService", base::FEATURE_ENABLED_BY_DEFAULT);
1616
+SET_CROMITE_FEATURE_DISABLED(kMantaService);
1717

18-
// Enables Orca Prod Server
18+
// Enables Anchovy Prod Server
19+
BASE_FEATURE(kAnchovyUseProdServer,
20+
@@ -19,6 +20,7 @@ BASE_FEATURE(kAnchovyUseProdServer,
1921
BASE_FEATURE(kOrcaUseProdServer,
2022
"OrcaUseProdServer",
2123
base::FEATURE_ENABLED_BY_DEFAULT);

build/patches/ungoogled-chromium-no-special-hosts-domains.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/rende
962962
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
963963
--- a/chrome/test/BUILD.gn
964964
+++ b/chrome/test/BUILD.gn
965-
@@ -6635,7 +6635,6 @@ test("unit_tests") {
965+
@@ -6636,7 +6636,6 @@ test("unit_tests") {
966966
"//chrome/browser/file_system_access:unit_tests",
967967
"//chrome/browser/fingerprinting_protection",
968968
"//chrome/browser/first_party_sets",

0 commit comments

Comments
 (0)