deletion of the '2.25.1' suffix used by bromite

build/patches/AImageReader-CFI-crash-mitigations.patch

@@ -248,4 +248,3 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_
               : TextureOwner::Mode::kSurfaceTextureInsecure;
  }
 --
-2.25.1

build/patches/Add-AllowUserCertificates-flag.patch

@@ -131,4 +131,3 @@ diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/j
                      CertVerifyStatusAndroid.OK, isIssuedByKnownRoot, verifiedChain);
          }
 --
-2.25.1

build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch

@@ -20,4 +20,3 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu
 
          KeyboardShortcutGroup webpageShortcutGroup =
 --
-2.25.1

build/patches/Add-IsCleartextPermitted-flag.patch

@@ -57,4 +57,3 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
      // Check whether the app allows cleartext traffic to this host, and return
      // ERR_CLEARTEXT_NOT_PERMITTED if not.
 --
-2.25.1

build/patches/Add-a-proxy-configuration-page.patch

@@ -1413,4 +1413,3 @@ diff --git a/net/proxy_resolution/proxy_config.h b/net/proxy_resolution/proxy_co
      // Returns one of {&proxies_for_http, &proxies_for_https, &proxies_for_ftp,
      // &fallback_proxies}, or NULL if there is no proxy to use.
 --
-2.25.1

build/patches/Add-an-always-incognito-mode.patch

@@ -2201,4 +2201,3 @@ diff --git a/net/base/file_stream_context.cc b/net/base/file_stream_context.cc
      file = base::OpenContentUriForRead(path);
    } else {
 --
-2.25.1

build/patches/Add-autoplay-site-setting.patch

@@ -341,4 +341,3 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.h b/thir
    bool IsOrWillBeAutoplayingMutedInternal(bool muted) const;
 
 --
-2.25.1

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

@@ -1848,4 +1848,3 @@ diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/selec
    if (!owning_window->GetRootWindow())
      return false;
 --
-2.25.1

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

@@ -229,4 +229,3 @@ new file mode 100644
 +SET_CROMITE_FEATURE_DISABLED(kCCTIntentFeatureOverrides);
 +SET_CROMITE_FEATURE_DISABLED(kCCTPostMessageAPI);
 --
-2.25.1

build/patches/Add-exit-menu-item.patch

@@ -130,4 +130,3 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
          Appearance
        </message>
 --
-2.25.1

build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch

@@ -135,4 +135,3 @@ new file mode 100644
 +
 +#endif
 --
-2.25.1

build/patches/Add-flag-for-save-data-header.patch

@@ -71,4 +71,3 @@ new file mode 100644
 @@ -0,0 +1 @@
 +COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kEnableSaveDataHeader);
 --
-2.25.1

build/patches/Add-flag-to-configure-maximum-connections-per-host.patch

@@ -124,4 +124,3 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
  }
 
 --
-2.25.1

build/patches/Add-flag-to-control-video-playback-resume-feature.patch

@@ -37,4 +37,3 @@ new file mode 100644
 @@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kResumeBackgroundVideo);
 --
-2.25.1

build/patches/Add-flag-to-disable-IPv6-probes.patch

@@ -89,4 +89,3 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
      ipv6_request_callbacks_.push_back(std::move(callback));
      return ERR_IO_PENDING;
 --
-2.25.1

build/patches/Add-flag-to-disable-external-intent-requests.patch

@@ -30,4 +30,3 @@ new file mode 100644
 +
 +#endif
 --
-2.25.1

build/patches/Add-flag-to-disable-vibration.patch

@@ -116,4 +116,3 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
        name: "OriginIsolationHeader",
        status: "stable",
 --
-2.25.1

build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch

@@ -40,4 +40,3 @@ diff --git a/build_overrides/build.gni b/build_overrides/build.gni
    # TODO(crbug.com/1402249): evaluate removing this end of 2023
    use_cxx17 = false
 --
-2.25.1

build/patches/Add-lifetime-options-for-permissions.patch

@@ -58,9 +58,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../one_time_permissions_tracker_factory.cc   |  2 +-
  .../permissions/embedded_permission_prompt.cc |  2 +-
  .../permission_prompt_bubble_base_view.cc     |  2 +-
- .../browser/content_autofill_driver.cc        | 64 ++++++++-------
- .../content/browser/content_autofill_driver.h |  2 +-
- .../autofill/core/browser/autofill_driver.h   |  2 +
  .../site_settings/PermissionInfo.java         | 14 +++-
  .../site_settings/SingleWebsiteSettings.java  | 10 +++
  .../WebsitePreferenceBridge.java              |  6 +-
@@ -91,7 +88,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/permissions/permission_request.h   | 16 +++-
  .../permissions/permission_request_manager.cc | 45 ++++++----
  .../permissions/permission_request_manager.h  | 11 ++-
- 39 files changed, 548 insertions(+), 92 deletions(-)
+ 36 files changed, 511 insertions(+), 61 deletions(-)
 
 diff --git a/chrome/browser/permissions/last_tab_standing_tracker.cc b/chrome/browser/permissions/last_tab_standing_tracker.cc
 --- a/chrome/browser/permissions/last_tab_standing_tracker.cc
@@ -254,207 +251,6 @@ diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_v
        return;
      case PermissionDialogButton::kDeny:
        RecordDecision(permissions::PermissionAction::DENIED);
-diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/components/autofill/content/browser/content_autofill_driver.cc
---- a/components/autofill/content/browser/content_autofill_driver.cc
-+++ b/components/autofill/content/browser/content_autofill_driver.cc
-@@ -455,8 +455,8 @@ void ContentAutofillDriver::FormsSeen(
-                         const std::vector<FormGlobalId>& removed_forms) {
-                        target->GetAutofillManager().OnFormsSeen(
-                            WithNewVersion(updated_forms), removed_forms);
--                       if (target->secondary_autofill_manager_) {
--                         target->secondary_autofill_manager_->OnFormsSeen(
-+                       if (target->secondary_autofill_manager()) {
-+                         target->secondary_autofill_manager()->OnFormsSeen(
-                            WithNewVersion(updated_forms), removed_forms);
-                        }
-                      });
-@@ -486,8 +486,8 @@ void ContentAutofillDriver::FormSubmitted(
-         }
-         target->GetAutofillManager().OnFormSubmitted(
-             WithNewVersion(form), known_success, submission_source);
--        if (target->secondary_autofill_manager_) {
--          target->secondary_autofill_manager_->OnFormSubmitted(
-+        if (target->secondary_autofill_manager()) {
-+          target->secondary_autofill_manager()->OnFormSubmitted(
-             WithNewVersion(form), known_success, submission_source);
-         }
-       });
-@@ -511,8 +511,8 @@ void ContentAutofillDriver::TextFieldDidChange(const FormData& raw_form,
-          base::TimeTicks timestamp) {
-         target->GetAutofillManager().OnTextFieldDidChange(
-             WithNewVersion(form), field, bounding_box, timestamp);
--        if (target->secondary_autofill_manager_) {
--          target->secondary_autofill_manager_->OnTextFieldDidChange(
-+        if (target->secondary_autofill_manager()) {
-+          target->secondary_autofill_manager()->OnTextFieldDidChange(
-             WithNewVersion(form), field, bounding_box, timestamp);
-         }
-       });
-@@ -534,8 +534,8 @@ void ContentAutofillDriver::TextFieldDidScroll(const FormData& raw_form,
-          const FormFieldData& field, const gfx::RectF& bounding_box) {
-         target->GetAutofillManager().OnTextFieldDidScroll(WithNewVersion(form),
-                                                           field, bounding_box);
--        if (target->secondary_autofill_manager_) {
--          target->secondary_autofill_manager_->OnTextFieldDidScroll(
-+        if (target->secondary_autofill_manager()) {
-+          target->secondary_autofill_manager()->OnTextFieldDidScroll(
-               WithNewVersion(form), field, bounding_box);
-         }
-       });
-@@ -558,8 +558,8 @@ void ContentAutofillDriver::SelectControlDidChange(
-          const FormFieldData& field, const gfx::RectF& bounding_box) {
-         target->GetAutofillManager().OnSelectControlDidChange(
-             WithNewVersion(form), field, bounding_box);
--        if (target->secondary_autofill_manager_) {
--          target->secondary_autofill_manager_->OnSelectControlDidChange(
-+        if (target->secondary_autofill_manager()) {
-+          target->secondary_autofill_manager()->OnSelectControlDidChange(
-             WithNewVersion(form), field, bounding_box);
-         }
-       });
-@@ -584,8 +584,8 @@ void ContentAutofillDriver::AskForValuesToFill(
-          AutofillSuggestionTriggerSource trigger_source) {
-         target->GetAutofillManager().OnAskForValuesToFill(
-             WithNewVersion(form), field, bounding_box, trigger_source);
--        if (target->secondary_autofill_manager_) {
--          target->secondary_autofill_manager_->OnAskForValuesToFill(
-+        if (target->secondary_autofill_manager()) {
-+          target->secondary_autofill_manager()->OnAskForValuesToFill(
-               WithNewVersion(form), field, bounding_box, trigger_source);
-         }
-       });
-@@ -599,8 +599,8 @@ void ContentAutofillDriver::HidePopup() {
-     DCHECK(!target->IsPrerendering())
-         << "We should never affect UI while prerendering";
-     target->GetAutofillManager().OnHidePopup();
--    if (target->secondary_autofill_manager_)
--      target->secondary_autofill_manager_->OnHidePopup();
-+    if (target->secondary_autofill_manager())
-+      target->secondary_autofill_manager()->OnHidePopup();
-   });
- }
-
-@@ -612,8 +612,8 @@ void ContentAutofillDriver::FocusNoLongerOnForm(bool had_interacted_form) {
-       this, had_interacted_form,
-       [](autofill::AutofillDriver* target, bool had_interacted_form) {
-         target->GetAutofillManager().OnFocusNoLongerOnForm(had_interacted_form);
--        if (target->secondary_autofill_manager_)
--          target->secondary_autofill_manager_->OnFocusNoLongerOnForm(had_interacted_form);
-+        if (target->secondary_autofill_manager())
-+          target->secondary_autofill_manager()->OnFocusNoLongerOnForm(had_interacted_form);
-       });
- }
-
-@@ -633,15 +633,15 @@ void ContentAutofillDriver::FocusOnFormField(const FormData& raw_form,
-          const FormFieldData& field, const gfx::RectF& bounding_box) {
-         target->GetAutofillManager().OnFocusOnFormField(WithNewVersion(form),
-                                                         field, bounding_box);
--        if (target->secondary_autofill_manager_) {
--          target->secondary_autofill_manager_->OnFocusOnFormField(
-+        if (target->secondary_autofill_manager()) {
-+          target->secondary_autofill_manager()->OnFocusOnFormField(
-             WithNewVersion(form), field, bounding_box);
-         }
-       },
-       [](autofill::AutofillDriver* target) {
-         target->GetAutofillManager().OnFocusNoLongerOnForm(true);
--        if (target->secondary_autofill_manager_) {
--          target->secondary_autofill_manager_->OnFocusNoLongerOnForm(true);
-+        if (target->secondary_autofill_manager()) {
-+          target->secondary_autofill_manager()->OnFocusNoLongerOnForm(true);
-         }
-       });
- }
-@@ -657,8 +657,8 @@ void ContentAutofillDriver::DidFillAutofillFormData(const FormData& raw_form,
-          base::TimeTicks timestamp) {
-         target->GetAutofillManager().OnDidFillAutofillFormData(
-             WithNewVersion(form), timestamp);
--        if (target->secondary_autofill_manager_) {
--          target->secondary_autofill_manager_->OnDidFillAutofillFormData(
-+        if (target->secondary_autofill_manager()) {
-+          target->secondary_autofill_manager()->OnDidFillAutofillFormData(
-             WithNewVersion(form), timestamp);
-         }
-       });
-@@ -670,8 +670,8 @@ void ContentAutofillDriver::DidEndTextFieldEditing() {
-   }
-   router().DidEndTextFieldEditing(this, [](autofill::AutofillDriver* target) {
-     target->GetAutofillManager().OnDidEndTextFieldEditing();
--    if (target->secondary_autofill_manager_)
--      target->secondary_autofill_manager_->OnDidEndTextFieldEditing();
-+    if (target->secondary_autofill_manager())
-+      target->secondary_autofill_manager()->OnDidEndTextFieldEditing();
-   });
- }
-
-@@ -686,8 +686,8 @@ void ContentAutofillDriver::SelectOrSelectListFieldOptionsDidChange(
-         cast(target)
-             ->GetAutofillManager()
-             .OnSelectOrSelectListFieldOptionsDidChange(WithNewVersion(form));
--        if (target->secondary_autofill_manager_) {
--          target->secondary_autofill_manager_->OnSelectOrSelectMenuFieldOptionsDidChange(
-+        if (target->secondary_autofill_manager()) {
-+          target->secondary_autofill_manager()->OnSelectOrSelectListFieldOptionsDidChange(
-             WithNewVersion(form));
-         }
-       });
-@@ -709,8 +709,8 @@ void ContentAutofillDriver::JavaScriptChangedAutofilledValue(
-          const FormFieldData& field, const std::u16string& old_value) {
-         target->GetAutofillManager().OnJavaScriptChangedAutofilledValue(
-             WithNewVersion(form), field, old_value);
--        if (target->secondary_autofill_manager_) {
--          target->secondary_autofill_manager_->OnJavaScriptChangedAutofilledValue(
-+        if (target->secondary_autofill_manager()) {
-+          target->secondary_autofill_manager()->OnJavaScriptChangedAutofilledValue(
-             WithNewVersion(form), field, old_value);
-         }
-       });
-@@ -725,8 +725,8 @@ void ContentAutofillDriver::OnContextMenuShownInField(
-          const FieldGlobalId& field_global_id) {
-         target->GetAutofillManager().OnContextMenuShownInField(form_global_id,
-                                                                field_global_id);
--        if (target->secondary_autofill_manager_)
--          target->secondary_autofill_manager_->OnContextMenuShownInField(form_global_id, field_global_id);
-+        if (target->secondary_autofill_manager())
-+          target->secondary_autofill_manager()->OnContextMenuShownInField(form_global_id, field_global_id);
-       });
- }
-
-@@ -751,6 +751,10 @@ ContentAutofillDriver::GetAutofillAgent() {
-   return autofill_agent_;
- }
-
-+raw_ptr<AutofillManager> ContentAutofillDriver::secondary_autofill_manager() {
-+  return secondary_autofill_manager_.get();
-+}
-+
- void ContentAutofillDriver::SetFrameAndFormMetaData(
-     FormData& form,
-     FormFieldData* optional_field) const {
-diff --git a/components/autofill/content/browser/content_autofill_driver.h b/components/autofill/content/browser/content_autofill_driver.h
---- a/components/autofill/content/browser/content_autofill_driver.h
-+++ b/components/autofill/content/browser/content_autofill_driver.h
-@@ -133,7 +133,7 @@ class ContentAutofillDriver : public AutofillDriver,
-     autofill_manager_ = std::move(autofill_manager);
-     secondary_autofill_manager_ = std::move(secondary_autofill_manager);
-   }
--  AutofillManager* secondary_autofill_manager() { return secondary_autofill_manager_.get(); }
-+  raw_ptr<AutofillManager> secondary_autofill_manager() override;
-
-   content::RenderFrameHost* render_frame_host() { return &*render_frame_host_; }
-   const content::RenderFrameHost* render_frame_host() const {
-diff --git a/components/autofill/core/browser/autofill_driver.h b/components/autofill/core/browser/autofill_driver.h
---- a/components/autofill/core/browser/autofill_driver.h
-+++ b/components/autofill/core/browser/autofill_driver.h
-@@ -69,6 +69,8 @@ class AutofillDriver {
-   // Returns the AutofillManager owned by the AutofillDriver.
-   virtual AutofillManager& GetAutofillManager() = 0;
-
-+  virtual raw_ptr<AutofillManager> secondary_autofill_manager() = 0;
-+
-   // Returns whether the AutofillDriver instance is associated with an active
-   // frame in the MPArch sense.
-   virtual bool IsInActiveFrame() const = 0;
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java
@@ -1648,4 +1444,3 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe
    void CancelledIncludingDuplicates(PermissionRequest* request,
                                      bool is_final_decision = true);
 --
-2.25.1

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

@@ -746,4 +746,3 @@ diff --git a/components/sync_bookmarks/bookmark_specifics_conversions.cc b/compo
        return sync_pb::BookmarkSpecifics::FOLDER;
    }
 --
-2.25.1

build/patches/Add-menu-item-to-view-source.patch

@@ -127,4 +127,3 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_PREFS_SECTION_ACCOUNT_AND_GOOGLE_SERVICES" desc="Title for the group of account-related entries and google services in Settings. [CHAR_LIMIT=32]">
          You and Google
 --
-2.25.1

build/patches/Add-option-to-force-tablet-UI.patch

@@ -287,4 +287,3 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
      }
 
 --
-2.25.1

build/patches/Add-option-to-not-persist-tabs-across-sessions.patch

@@ -119,4 +119,3 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
          LINK
        </message>
 --
-2.25.1

build/patches/Add-option-to-use-home-page-as-NTP.patch

@@ -260,4 +260,3 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
  // The old key value is kept to avoid unnecessary migration code.
  inline constexpr char kSpeechRecognitionFilterProfanities[] =
 --
-2.25.1

build/patches/Add-search-engine.patch

@@ -94,4 +94,3 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  }
 
 --
-2.25.1

build/patches/Add-site-engagement-flag.patch

@@ -205,4 +205,3 @@ new file mode 100644
 +
 +#endif
 --
-2.25.1

build/patches/Add-support-for-ISupportHelpAndFeedback.patch

@@ -48,4 +48,3 @@ diff --git a/components/browser_ui/settings/android/java/src/org/chromium/compon
 +    }
  }
 --
-2.25.1

build/patches/Add-support-for-writing-URIs.patch

@@ -97,4 +97,3 @@ diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base
       * Check whether a content URI exists.
       *
 --
-2.25.1

build/patches/Add-webGL-site-setting.patch

@@ -284,4 +284,3 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
 
   private:
 --
-2.25.1

build/patches/Add-webRTC-site-settings.patch

@@ -262,4 +262,3 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
    capabilities->setCodecs(HeapVector<Member<RTCRtpCodecCapability>>());
    capabilities->setHeaderExtensions(
 --
-2.25.1

build/patches/Allow-building-without-enable_reporting.patch

@@ -508,4 +508,3 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_observer.cc b/third
 
  bool ReportingObserver::Buffered() {
 --
-2.25.1

build/patches/Allow-building-without-supervised-users.patch

@@ -291,4 +291,3 @@ diff --git a/components/supervised_user/core/common/supervised_user_utils.cc b/c
 
  bool EmitLogSegmentHistogram(const std::vector<AccountInfo>& primary_accounts) {
 --
-2.25.1

build/patches/Allow-playing-audio-in-background.patch

@@ -50,4 +50,3 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b
        const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) override;
    void SelectedVideoTrackChanged(
 --
-2.25.1

build/patches/Always-use-new-tab-page-for-default-home-page.patch

@@ -70,4 +70,3 @@ new file mode 100755
 +SET_CROMITE_FEATURE_DISABLED(kNewTabSearchEngineUrlAndroid);
 +SET_CROMITE_FEATURE_DISABLED(kPartnerCustomizationsUma);
 --
-2.25.1