AUTOMATED - git apply results

build/patches/00Disable-privacy-issues-in-password-manager.patch

@@ -123,9 +123,9 @@ diff --git a/components/password_manager/core/browser/features/password_features
 +             "fill-on-account-select",           // always enabled
 +             base::FEATURE_ENABLED_BY_DEFAULT);  // by default
  
- // Enables the notification UI that is displayed to the user when visiting a
- // website for which a stored password has been shared by another user.
-@@ -70,14 +70,14 @@ BASE_FEATURE(kSharedPasswordNotificationUI,
+ #if BUILDFLAG(IS_IOS)
+ // Enables migration to OSCrypt with a single query to the keychain.
+@@ -77,14 +77,14 @@ BASE_FEATURE(kSharedPasswordNotificationUI,
  // Enables password receiving service including incoming password sharing
  // invitation sync data type.
  BASE_FEATURE(kPasswordManagerEnableReceiverService,

build/patches/Add-menu-item-to-bookmark-all-tabs.patch

@@ -488,7 +488,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
  
    if (!DecodeMetaInfo(*roots, &model_meta_info_map_))
      return false;
-@@ -510,11 +522,13 @@ void BookmarkCodec::DecodeMetaInfoHelper(
+@@ -497,11 +509,13 @@ void BookmarkCodec::DecodeMetaInfoHelper(
  
  void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node,
                                  BookmarkNode* other_node,

build/patches/Bromite-subresource-adblocker.patch

@@ -437,7 +437,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
 --- a/chrome/app/generated_resources.grd
 +++ b/chrome/app/generated_resources.grd
-@@ -14274,6 +14274,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -14277,6 +14277,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
        Never show this again.
      </message>
  

build/patches/Disable-all-predictors-code.patch

@@ -217,7 +217,7 @@ diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/op
 diff --git a/components/optimization_guide/core/hints_manager.cc b/components/optimization_guide/core/hints_manager.cc
 --- a/components/optimization_guide/core/hints_manager.cc
 +++ b/components/optimization_guide/core/hints_manager.cc
-@@ -358,6 +358,7 @@ void HintsManager::Shutdown() {
+@@ -383,6 +383,7 @@ void HintsManager::Shutdown() {
  OptimizationGuideDecision
  HintsManager::GetOptimizationGuideDecisionFromOptimizationTypeDecision(
      OptimizationTypeDecision optimization_type_decision) {
@@ -225,15 +225,15 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
    switch (optimization_type_decision) {
      case OptimizationTypeDecision::kAllowedByOptimizationFilter:
      case OptimizationTypeDecision::kAllowedByHint:
-@@ -1066,6 +1067,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
+@@ -1091,6 +1092,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
      proto::RequestContext request_context,
      OnDemandOptimizationGuideDecisionRepeatingCallback callback) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 +  if ((true)) return; // no consent on bromite
  
-   // This set contains URLs that require some information to be fetched, whether
-   // that be a URL-keyed hint or a host-keyed hint.
-@@ -1386,6 +1388,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
+   InsertionOrderedSet<GURL> urls_to_fetch;
+   InsertionOrderedSet<std::string> hosts_to_fetch;
+@@ -1363,6 +1365,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
      bool skip_cache,
      OptimizationMetadata* optimization_metadata) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

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

@@ -677,7 +677,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
 --- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
 +++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
-@@ -621,11 +621,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) {
+@@ -619,11 +619,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) {
    // chrome-untrusted://new-tab-page for other external content and resources.
    // NOTE: Use caution when overriding content security policies as that cean
    // lead to subtle security bugs such as https://crbug.com/1251541.