[AUTO] Patches auto-rebase for master branch (#1634)
[AUTO] Patches auto-rebase for master branch
This commit is contained in:
@@ -951,7 +951,7 @@ new file mode 100644
|
||||
diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc
|
||||
--- a/chrome/browser/ui/ui_features.cc
|
||||
+++ b/chrome/browser/ui/ui_features.cc
|
||||
@@ -479,4 +479,5 @@ BASE_FEATURE(kPageSpecificDataDialogRelatedInstalledAppsSection,
|
||||
@@ -486,4 +486,5 @@ BASE_FEATURE(kPageSpecificDataDialogRelatedInstalledAppsSection,
|
||||
"PageSpecificDataDialogRelatedInstalledAppsSection",
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
|
||||
@@ -9,13 +9,15 @@ Subject: Keep Manta Service Disabled
|
||||
diff --git a/components/manta/features.cc b/components/manta/features.cc
|
||||
--- a/components/manta/features.cc
|
||||
+++ b/components/manta/features.cc
|
||||
@@ -9,11 +9,13 @@
|
||||
@@ -9,6 +9,7 @@
|
||||
namespace manta::features {
|
||||
|
||||
BASE_FEATURE(kMantaService, "MantaService", base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
+SET_CROMITE_FEATURE_DISABLED(kMantaService);
|
||||
|
||||
// Enables Orca Prod Server
|
||||
// Enables Anchovy Prod Server
|
||||
BASE_FEATURE(kAnchovyUseProdServer,
|
||||
@@ -19,6 +20,7 @@ BASE_FEATURE(kAnchovyUseProdServer,
|
||||
BASE_FEATURE(kOrcaUseProdServer,
|
||||
"OrcaUseProdServer",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
@@ -962,7 +962,7 @@ diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/rende
|
||||
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
||||
--- a/chrome/test/BUILD.gn
|
||||
+++ b/chrome/test/BUILD.gn
|
||||
@@ -6635,7 +6635,6 @@ test("unit_tests") {
|
||||
@@ -6636,7 +6636,6 @@ test("unit_tests") {
|
||||
"//chrome/browser/file_system_access:unit_tests",
|
||||
"//chrome/browser/fingerprinting_protection",
|
||||
"//chrome/browser/first_party_sets",
|
||||
|
||||
Reference in New Issue
Block a user