Remove unused parameter and state

Bug: 40100455
Change-Id: I62703a489eca4c6b11e452047d8f6b5389489c3e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5999929
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Reviewed-by: Christoph Schwering <schwering@google.com>
Auto-Submit: Jihad Hanna <jihadghanna@google.com>
Commit-Queue: Peter Conn <peconn@chromium.org>
Reviewed-by: Peter Conn <peconn@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1379639}

android_webview/renderer/aw_render_frame_ext.cc

@@ -46,8 +46,6 @@ using SecureContextRequired = autofill::AutofillAgent::SecureContextRequired;
 using UserGestureRequired = autofill::AutofillAgent::UserGestureRequired;
 using UsesKeyboardAccessoryForSuggestions =
     autofill::AutofillAgent::UsesKeyboardAccessoryForSuggestions;
-using EnableHeavyFormDataScraping =
-    autofill::PasswordAutofillAgent::EnableHeavyFormDataScraping;
 
 constexpr char kAddressPrefix[] = "geo:0,0?q=";
 constexpr char kEmailPrefix[] = "mailto:";
@@ -159,8 +157,8 @@ void PopulateHitTestData(const GURL& absolute_link_url,
 AwRenderFrameExt::AwRenderFrameExt(content::RenderFrame* render_frame)
     : content::RenderFrameObserver(render_frame) {
   auto password_autofill_agent =
-      std::make_unique<autofill::PasswordAutofillAgent>(
+      std::make_unique<autofill::PasswordAutofillAgent>(render_frame,
-          render_frame, &registry_, EnableHeavyFormDataScraping(false));
+                                                        &registry_);
   new AutofillAgent(
       render_frame,
       {ExtractAllDatalists(true), FocusRequiresScroll(false),

chrome/renderer/chrome_content_renderer_client.cc

@@ -302,8 +302,6 @@ using SecureContextRequired = autofill::AutofillAgent::SecureContextRequired;
 using UserGestureRequired = autofill::AutofillAgent::UserGestureRequired;
 using UsesKeyboardAccessoryForSuggestions =
     autofill::AutofillAgent::UsesKeyboardAccessoryForSuggestions;
-using EnableHeavyFormDataScraping =
-    autofill::PasswordAutofillAgent::EnableHeavyFormDataScraping;
 
 namespace {
 
@@ -708,10 +706,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
   if (!render_frame->IsInFencedFrameTree() ||
       base::FeatureList::IsEnabled(blink::features::kFencedFramesAPIChanges)) {
     auto password_autofill_agent = std::make_unique<PasswordAutofillAgent>(
-        render_frame, associated_interfaces,
+        render_frame, associated_interfaces);
-        EnableHeavyFormDataScraping(
-            chrome::GetChannel() == version_info::Channel::CANARY ||
-            chrome::GetChannel() == version_info::Channel::DEV));
     auto password_generation_agent = std::make_unique<PasswordGenerationAgent>(
         render_frame, password_autofill_agent.get(), associated_interfaces);
     new AutofillAgent(

components/autofill/content/renderer/password_autofill_agent.cc

@@ -752,10 +752,8 @@ void PasswordAutofillAgent::FocusStateNotifier::NotifyIfChanged(
 
 PasswordAutofillAgent::PasswordAutofillAgent(
     content::RenderFrame* render_frame,
-    blink::AssociatedInterfaceRegistry* registry,
+    blink::AssociatedInterfaceRegistry* registry)
-    EnableHeavyFormDataScraping enable_heavy_form_data_scraping)
+    : content::RenderFrameObserver(render_frame) {
-    : content::RenderFrameObserver(render_frame),
-      enable_heavy_form_data_scraping_(enable_heavy_form_data_scraping) {
   registry->AddInterface<mojom::PasswordAutofillAgent>(base::BindRepeating(
       &PasswordAutofillAgent::BindPendingReceiver, base::Unretained(this)));
 }
@@ -1723,7 +1721,6 @@ PasswordAutofillAgent::GetFormDataFromUnownedInputElements() {
     return std::nullopt;
   return CreateFormDataFromUnownedInputElements(
       *web_frame, field_data_manager(), &username_detector_cache_,
-      *enable_heavy_form_data_scraping_ ? &button_titles_cache_ : nullptr,
       autofill_agent_->GetCallTimerState(
           CallTimerState::CallSite::kGetFormDataFromUnownedInputElements));
 }

components/autofill/content/renderer/password_autofill_agent.h

@@ -110,14 +110,10 @@ class PasswordGenerationAgent;
 class PasswordAutofillAgent : public content::RenderFrameObserver,
                               public mojom::PasswordAutofillAgent {
  public:
-  using EnableHeavyFormDataScraping =
-      base::StrongAlias<class EnableHeavyFormDataScrapingTag, bool>;
   using UseFallbackData = base::StrongAlias<class UseFallbackDataTag, bool>;
 
-  PasswordAutofillAgent(
+  PasswordAutofillAgent(content::RenderFrame* render_frame,
-      content::RenderFrame* render_frame,
+                        blink::AssociatedInterfaceRegistry* registry);
-      blink::AssociatedInterfaceRegistry* registry,
-      EnableHeavyFormDataScraping enable_heavy_form_data_scraping);
 
   PasswordAutofillAgent(const PasswordAutofillAgent&) = delete;
   PasswordAutofillAgent& operator=(const PasswordAutofillAgent&) = delete;
@@ -579,10 +575,6 @@ class PasswordAutofillAgent : public content::RenderFrameObserver,
     return autofill_agent_->field_data_manager();
   }
 
-  // Controls heavy scraping of form data (e.g., button titles for unowned
-  // forms) is enabled.
-  EnableHeavyFormDataScraping enable_heavy_form_data_scraping_;
-
   // A map from WebInput elements to `PasswordInfo` for all elements that
   // password manager has fill information for.
   //

components/autofill/content/renderer/password_form_conversion_utils.cc

@@ -147,7 +147,6 @@ std::optional<FormData> CreateFormDataFromUnownedInputElements(
     const WebLocalFrame& frame,
     const FieldDataManager& field_data_manager,
     UsernameDetectorCache* username_detector_cache,
-    form_util::ButtonTitlesCache* button_titles_cache,
     const CallTimerState& timer_state) {
   std::optional<FormData> form_data = form_util::ExtractFormData(
       frame.GetDocument(), WebFormElement(), field_data_manager, timer_state);

components/autofill/content/renderer/password_form_conversion_utils.h

@@ -52,7 +52,6 @@ std::optional<FormData> CreateFormDataFromUnownedInputElements(
     const blink::WebLocalFrame& frame,
     const FieldDataManager& field_data_manager,
     UsernameDetectorCache* username_detector_cache,
-    form_util::ButtonTitlesCache* button_titles_cache,
     const CallTimerState& timer_state);
 
 // The "Realm" for the sign-on. This is scheme, host, port.

components/autofill/content/renderer/test_password_autofill_agent.cc

@@ -9,9 +9,7 @@ namespace autofill {
 TestPasswordAutofillAgent::TestPasswordAutofillAgent(
     content::RenderFrame* render_frame,
     blink::AssociatedInterfaceRegistry* registry)
-    : PasswordAutofillAgent(render_frame,
+    : PasswordAutofillAgent(render_frame, registry) {}
-                            registry,
-                            EnableHeavyFormDataScraping(false)) {}
 
 TestPasswordAutofillAgent::~TestPasswordAutofillAgent() = default;