deletion of the '2.25.1' suffix used by bromite

2024-01-22 11:33:32 +01:00
parent 94d2bececa
commit 79e176dd6e
197 changed files with 59 additions and 467 deletions
@@ -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
@@ -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
@@ -20,4 +20,3 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu
 
         KeyboardShortcutGroup webpageShortcutGroup =
 --
-2.25.1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -229,4 +229,3 @@ new file mode 100644
 +SET_CROMITE_FEATURE_DISABLED(kCCTIntentFeatureOverrides);
 +SET_CROMITE_FEATURE_DISABLED(kCCTPostMessageAPI);
 --
-2.25.1
@@ -130,4 +130,3 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
         Appearance
       </message>
 --
-2.25.1
@@ -135,4 +135,3 @@ new file mode 100644
 +
 +#endif
 --
-2.25.1
@@ -71,4 +71,3 @@ new file mode 100644
@@ -0,0 +1 @@
 +COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kEnableSaveDataHeader);
 --
-2.25.1
@@ -124,4 +124,3 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
 }
 
 --
-2.25.1
@@ -37,4 +37,3 @@ new file mode 100644
@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kResumeBackgroundVideo);
 --
-2.25.1
@@ -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
@@ -30,4 +30,3 @@ new file mode 100644
 +
 +#endif
 --
-2.25.1
@@ -116,4 +116,3 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
       name: "OriginIsolationHeader",
       status: "stable",
 --
-2.25.1
@@ -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
@@ -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
@@ -746,4 +746,3 @@ diff --git a/components/sync_bookmarks/bookmark_specifics_conversions.cc b/compo
       return sync_pb::BookmarkSpecifics::FOLDER;
   }
 --
-2.25.1
@@ -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
@@ -287,4 +287,3 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
     }
 
 --
-2.25.1
@@ -119,4 +119,3 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
         LINK
       </message>
 --
-2.25.1
@@ -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
@@ -94,4 +94,3 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
 }
 
 --
-2.25.1
@@ -205,4 +205,3 @@ new file mode 100644
 +
 +#endif
 --
-2.25.1
@@ -48,4 +48,3 @@ diff --git a/components/browser_ui/settings/android/java/src/org/chromium/compon
 +    }
 }
 --
-2.25.1
@@ -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
@@ -284,4 +284,3 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
 
  private:
 --
-2.25.1
@@ -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
@@ -508,4 +508,3 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_observer.cc b/third
 
 bool ReportingObserver::Buffered() {
 --
-2.25.1
@@ -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
@@ -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
@@ -70,4 +70,3 @@ new file mode 100755
 +SET_CROMITE_FEATURE_DISABLED(kNewTabSearchEngineUrlAndroid);
 +SET_CROMITE_FEATURE_DISABLED(kPartnerCustomizationsUma);
 --
-2.25.1
@@ -204,4 +204,3 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
   }
 }
 --
-2.25.1
@@ -64,4 +64,3 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
 
 void BatteryManager::RegisterWithDispatcher() {
 --
-2.25.1
@@ -302,4 +302,3 @@ diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.h b/
 
   // Returns true if |protocol| is a valid WebSocket subprotocol name.
 --
-2.25.1
@@ -287,4 +287,3 @@ diff --git a/url/url_util.cc b/url/url_util.cc
 
   // Schemes that can be sent CORS requests.
 --
-2.25.1
@@ -104,4 +104,3 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
         Import
       </message>
 --
-2.25.1
@@ -1623,4 +1623,3 @@ new file mode 100644
@@ -0,0 +1 @@
 +BASE_DECLARE_FEATURE(kInlineUpdateFlow);
 --
-2.25.1
@@ -20,4 +20,3 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_p
     chrome_public_manifest_package += ".stable"
   } else if (android_channel != "default" && android_channel != "stable") {
 --
-2.25.1
@@ -1999,4 +1999,3 @@ new file mode 100644
 +SET_CROMITE_FEATURE_DISABLED(kAutomaticLazyFrameLoadingToEmbeds);
 +SET_CROMITE_FEATURE_DISABLED(kAutomaticLazyFrameLoadingToEmbedUrls);
 --
-2.25.1
@@ -151,4 +151,3 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
     {
       // https://chromestatus.com/feature/5132477781245952
 --
-2.25.1
@@ -2392,4 +2392,3 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 enum ReasonForCallingCanExecuteScripts {
   kAboutToExecuteScript,
 --
-2.25.1
@@ -95,4 +95,3 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 
     @Override
 --
-2.25.1
@@ -55,4 +55,3 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/access
         final ViewStructure viewRoot = structure.asyncNewChild(0);
         viewRoot.setClassName("");
 --
-2.25.1
@@ -18,4 +18,3 @@ new file mode 100644
@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kAsyncDns);
 --
-2.25.1
@@ -19,4 +19,3 @@ new file mode 100644
 +
 +#endif
 --
-2.25.1
@@ -220,4 +220,3 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
   // allows to query whether the site associated with the |url| is allowed to
   // access Site data (aka ContentSettingsType::COOKIES) without considering any
 --
-2.25.1
@@ -22,4 +22,3 @@ diff --git a/components/feed/core/shared_prefs/pref_names.cc b/components/feed/c
 }
 
 --
-2.25.1
@@ -37,4 +37,3 @@ new file mode 100644
 +
 +#endif
 --
-2.25.1
@@ -30,4 +30,3 @@ new file mode 100644
@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kStartSurfaceAndroid);
 --
-2.25.1
@@ -250,4 +250,3 @@ diff --git a/net/socket/ssl_client_socket_impl.h b/net/socket/ssl_client_socket_
   void DoReadCallback(int result);
   void DoWriteCallback(int result);
 --
-2.25.1
@@ -58,4 +58,3 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_
 
 void NavigatorUAData::SetBitness(const String& bitness) {
 --
-2.25.1
@@ -24,4 +24,3 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHo
                                 }
                                 mLastClickedMostVisitedTileUrl = null;
 --
-2.25.1
@@ -506,4 +506,3 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
     {
       name: "Presentation",
 --
-2.25.1
@@ -88,4 +88,3 @@ new file mode 100755
@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kChromeLabs);
 --
-2.25.1
@@ -781,4 +781,3 @@ diff --git a/ui/events/android/motion_event_android.cc b/ui/events/android/motio
 }
 
 --
-2.25.1
@@ -26,4 +26,3 @@ new file mode 100644
@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kCrashReporting);
 --
-2.25.1
@@ -72,4 +72,3 @@ diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature
 +SET_CROMITE_FEATURE_DISABLED(kWebFeed);
 }  // namespace feed
 --
-2.25.1
@@ -409,4 +409,3 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
 }
 
 --
-2.25.1
@@ -68,4 +68,3 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
       name: "ImplicitRootScroller",
       public: true,
 --
-2.25.1
@@ -22,4 +22,3 @@ diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/
 // Feature used to default typed navigations to use HTTPS instead of HTTP.
 // This only applies to navigations that don't have a scheme such as
 --
-2.25.1
@@ -98,4 +98,3 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
     {
       name: "RemoveDanglingMarkupInTarget",
 --
-2.25.1
@@ -36,4 +36,3 @@ diff --git a/components/minidump_uploader/android/java/src/org/chromium/componen
                 (JobScheduler)
                         ContextUtils.getApplicationContext()
 --
-2.25.1
@@ -15,4 +15,3 @@ new file mode 100644
@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kOfflinePagesInDownloadHomeOpenInCctFeature);
 --
-2.25.1
@@ -54,4 +54,3 @@ new file mode 100755
@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kAndroidVisibleUrlTruncation);
 --
-2.25.1
@@ -21,4 +21,3 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
 
 void LocalFrame::SetAdTrackerForTesting(AdTracker* ad_tracker) {
 --
-2.25.1
@@ -60,4 +60,3 @@ diff --git a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css b/th
 body,
 table,
 --
-2.25.1
@@ -43,4 +43,3 @@ diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc b/c
 
 ChromeOmniboxNavigationObserver::~ChromeOmniboxNavigationObserver() {
 --
-2.25.1
@@ -144,4 +144,3 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
                 delegate.openSettingsPage(SettingsFragment.SITE);
                 break;
 --
-2.25.1
@@ -89,4 +89,3 @@ new file mode 100644
@@ -0,0 +1 @@
 +BASE_DECLARE_FEATURE(kChromeSmartSelection);
 --
-2.25.1
@@ -23,4 +23,3 @@ new file mode 100644
@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kSignedHTTPExchange);
 --
-2.25.1
@@ -92,4 +92,3 @@ diff --git a/chrome/utility/safe_browsing/archive_analyzer.cc b/chrome/utility/s
     return std::make_unique<ZipAnalyzer>();
   } else if (file_type == DownloadFileType::SEVEN_ZIP) {
 --
-2.25.1
@@ -106,4 +106,3 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
     {
       name: "TextFragmentTapOpensContextMenu",
 --
-2.25.1
@@ -33,4 +33,3 @@ diff --git a/chrome/browser/media/router/discovery/dial/dial_registry.cc b/chrom
 }
 
 --
-2.25.1
@@ -261,4 +261,3 @@ diff --git a/third_party/blink/renderer/core/origin_trials/origin_trial_context.
     return base::FeatureList::IsEnabled(features::kPrivacySandboxAdsAPIs);
 
 --
-2.25.1
@@ -20,4 +20,3 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/background_task
                 return new BackgroundSyncBackgroundTask();
             case TaskIds.NOTIFICATION_SCHEDULER_JOB_ID:
 --
-2.25.1
@@ -229,4 +229,3 @@ diff --git a/services/metrics/public/cpp/ukm_recorder.cc b/services/metrics/publ
 +SET_CROMITE_FEATURE_DISABLED(kUkmFeature);
 }  // namespace ukm
 --
-2.25.1
@@ -34,4 +34,3 @@ diff --git a/chrome/browser/ui/startup/infobar_utils.cc b/chrome/browser/ui/star
       PrefService* local_state = g_browser_process->local_state();
       if (!local_state ||
 --
-2.25.1
@@ -125,4 +125,3 @@ diff --git a/chrome/browser/share/android/java_sources.gni b/chrome/browser/shar
   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/EditorScreenshotTask.java",
   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotCoordinator.java",
 --
-2.25.1
@@ -40,4 +40,3 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
         if (mDialogModel != null) return;
 
 --
-2.25.1
@@ -24,4 +24,3 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn
 
   if (use_allocator_shim) {
 --
-2.25.1
@@ -40,4 +40,3 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp
   registry->RegisterIntegerPref(
       prefs::kCurrentMigrationVersionToGoogleMobileServices, 0);
 --
-2.25.1
@@ -91,4 +91,3 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 
     // Only invalidate cache if new overrides have resulted in a config change.
 --
-2.25.1
@@ -160,4 +160,3 @@ diff --git a/services/network/sct_auditing/sct_auditing_handler.cc b/services/ne
   auto reporter = std::make_unique<SCTAuditingReporter>(
       owner_network_context_, reporter_key, std::move(report),
 --
-2.25.1
@@ -16,4 +16,3 @@ new file mode 100644
 +SET_CROMITE_FEATURE_ENABLED(kEncryptedClientHello);
 +SET_CROMITE_FEATURE_ENABLED(kEncryptedClientHelloQuic);
 --
-2.25.1
@@ -24,4 +24,3 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID)
 // Enables HEVC hardware accelerated encoding for Windows, Mac, and Android.
 --
-2.25.1
@@ -15,4 +15,3 @@ new file mode 100644
@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_ENABLED(kPermuteTLSExtensions);
 --
-2.25.1
@@ -78,4 +78,3 @@ new file mode 100644
@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_ENABLED(kStrictOriginIsolation);
 --
-2.25.1
@@ -38,4 +38,3 @@ new file mode 100644
 +
 +#endif  // BUILDFLAG(IS_ANDROID)
 --
-2.25.1
@@ -57,4 +57,3 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
     if (fatal_linker_warnings && !is_apple && current_os != "aix" &&
         current_os != "zos") {
 --
-2.25.1
@@ -30,17 +30,18 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../autofill/AutofillManagerWrapper.java      |  5 +-
 .../components/autofill/AutofillProvider.java |  7 ++
 .../BrowserSelectionActionMenuDelegate.java   | 62 ++++++++++++++
- .../browser/content_autofill_driver.cc        | 53 ++++++++++++
+ .../browser/content_autofill_driver.cc        | 57 +++++++++++++
 .../content/browser/content_autofill_driver.h |  9 ++-
 .../content_autofill_driver_factory.cc        | 11 ++-
 .../browser/content_autofill_driver_factory.h |  1 +
 .../renderer/password_autofill_agent.cc       |  5 +-
+ .../autofill/core/browser/autofill_driver.h   |  2 +
 .../autofill/core/common/autofill_prefs.cc    |  6 ++
 .../autofill/core/common/autofill_prefs.h     |  2 +
 .../embedder_support/view/ContentView.java    | 46 +++++++++++
 .../selection/FloatingPastePopupMenu.java     |  3 +-
 .../chromium/ui/base/ViewAndroidDelegate.java |  8 ++
- 25 files changed, 404 insertions(+), 10 deletions(-)
+ 26 files changed, 410 insertions(+), 10 deletions(-)
 create mode 100644 components/android_autofill/browser/java/src/org/chromium/components/autofill/BrowserSelectionActionMenuDelegate.java

 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
@@ -585,8 +586,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
                         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);
 +                       }
                      });
@@ -596,8 +597,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
         }
         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);
 +        }
       });
@@ -607,8 +608,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
          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);
 +        }
       });
@@ -618,8 +619,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
          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);
 +        }
       });
@@ -629,8 +630,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
          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);
 +        }
       });
@@ -640,8 +641,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
          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);
 +        }
       });
@@ -651,8 +652,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
     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();
   });
 }
 
@@ -660,8 +661,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
       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);
       });
 }
 
@@ -669,15 +670,15 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
          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);
 +        }
       });
 }
@@ -686,8 +687,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
          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);
 +        }
       });
@@ -697,8 +698,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
   }
   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();
   });
 }
 
@@ -706,8 +707,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
         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));
 +        }
       });
@@ -717,8 +718,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
          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);
 +        }
       });
@@ -728,8 +729,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
          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);
       });
 }
 
@@ -742,6 +743,17 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
 }
 
 const mojo::AssociatedRemote<mojom::AutofillAgent>&
+@@ -698,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
@@ -755,7 +767,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.h b/com
     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 {
@@ -826,6 +838,18 @@ diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/c
 }
 
 void PasswordAutofillAgent::FillPasswordSuggestion(
+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/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc
 --- a/components/autofill/core/common/autofill_prefs.cc
 +++ b/components/autofill/core/common/autofill_prefs.cc
@@ -972,4 +996,3 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java b
 +    public void autofill(final SparseArray<AutofillValue> values) {}
 }
 --
-2.25.1
@@ -37,4 +37,3 @@ new file mode 100644
@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_ENABLED(kSplitAuthCacheByNetworkIsolationKey);
 --
-2.25.1
@@ -15,4 +15,3 @@ new file mode 100644
@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_ENABLED(kPrefetchPrivacyChanges);
 --
-2.25.1
@@ -468,4 +468,3 @@ new file mode 100644
@@ -0,0 +1 @@
 +BASE_DECLARE_FEATURE(kSharedIntentUI);
 --
-2.25.1
@@ -15,4 +15,3 @@ new file mode 100644
@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_ENABLED(kThirdPartyStoragePartitioning);
 --
-2.25.1
@@ -10485,4 +10485,3 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_
 
   # START ios/ section.
 --
-2.25.1
@@ -22,4 +22,3 @@ diff --git a/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/b
         final boolean newNightModeOn =
                 theme == ThemeType.SYSTEM_DEFAULT
 --
-2.25.1
@@ -87,4 +87,3 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
     {
       name: "ReferenceBoxNoPixelSnapping",
 --
-2.25.1
--- a/Show More
+++ b/Show More