[Passwords] Clean Up PasswordFormGenerationData

This change simplifies PasswordFormGenerationData by turning it into an
aggregate struct. This allows the removal of explicitly listing
constructors, assignment operators and destructors, and also allows the
usage of designated initializers for more type safety.

Bug: 1075444
Change-Id: I9bab98cebb43d45e8a0ea29702a1e326f1bd63d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2498595Reviewed-by: Maria Kazinova <kazinova@google.com>
Reviewed-by: Christoph Schwering <schwering@google.com>
Commit-Queue: Jan Wilken Dörrie <jdoerrie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821211}

components/autofill/core/common/BUILD.gn

@@ -51,7 +51,6 @@ static_library("common") {
     "password_form.h",
     "password_form_fill_data.cc",
     "password_form_fill_data.h",
-    "password_form_generation_data.cc",
     "password_form_generation_data.h",
     "password_generation_util.cc",
     "password_generation_util.h",

components/autofill/core/common/password_form_generation_data.cc

-// Copyright (c) 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "components/autofill/core/common/password_form_generation_data.h"
-
-#include <utility>
-
-namespace autofill {
-
-PasswordFormGenerationData::PasswordFormGenerationData() = default;
-
-PasswordFormGenerationData::PasswordFormGenerationData(
-    FieldRendererId new_password_renderer_id,
-    FieldRendererId confirmation_password_renderer_id)
-    : new_password_renderer_id(new_password_renderer_id),
-      confirmation_password_renderer_id(confirmation_password_renderer_id) {}
-
-#if defined(OS_IOS)
-PasswordFormGenerationData::PasswordFormGenerationData(
-    FormRendererId form_renderer_id,
-    FieldRendererId new_password_renderer_id,
-    FieldRendererId confirmation_password_renderer_id)
-    : form_renderer_id(form_renderer_id),
-      new_password_renderer_id(new_password_renderer_id),
-      confirmation_password_renderer_id(confirmation_password_renderer_id) {}
-
-PasswordFormGenerationData::PasswordFormGenerationData(
-    const PasswordFormGenerationData&) = default;
-
-PasswordFormGenerationData& PasswordFormGenerationData::operator=(
-    const PasswordFormGenerationData&) = default;
-
-PasswordFormGenerationData::PasswordFormGenerationData(
-    PasswordFormGenerationData&&) = default;
-
-PasswordFormGenerationData& PasswordFormGenerationData::operator=(
-    PasswordFormGenerationData&&) = default;
-
-PasswordFormGenerationData::~PasswordFormGenerationData() = default;
-
-#endif
-
-}  // namespace autofill

components/autofill/core/common/password_form_generation_data.h

@@ -5,32 +5,15 @@
 #ifndef COMPONENTS_AUTOFILL_CORE_COMMON_PASSWORD_FORM_GENERATION_DATA_H_
 #define COMPONENTS_AUTOFILL_CORE_COMMON_PASSWORD_FORM_GENERATION_DATA_H_
 
-#include <stdint.h>
-
-#include "base/optional.h"
 #include "build/build_config.h"
 #include "components/autofill/core/common/renderer_id.h"
-#include "url/gurl.h"
 
 namespace autofill {
 
 // Structure used for sending information from browser to renderer about on
 // which fields password should be generated.
 struct PasswordFormGenerationData {
-  PasswordFormGenerationData();
-  PasswordFormGenerationData(FieldRendererId new_password_renderer_id,
-                             FieldRendererId confirmation_password_renderer_id);
 #if defined(OS_IOS)
-  PasswordFormGenerationData(FormRendererId form_renderer_id,
-                             FieldRendererId new_password_renderer_id,
-                             FieldRendererId confirmation_password_renderer_id);
-
-  PasswordFormGenerationData(const PasswordFormGenerationData&);
-  PasswordFormGenerationData& operator=(const PasswordFormGenerationData&);
-  PasswordFormGenerationData(PasswordFormGenerationData&&);
-  PasswordFormGenerationData& operator=(PasswordFormGenerationData&&);
-  ~PasswordFormGenerationData();
-
   FormRendererId form_renderer_id;
 #endif
   FieldRendererId new_password_renderer_id;

components/password_manager/core/browser/password_form_manager.cc

@@ -795,21 +795,15 @@ void PasswordFormManager::Fill() {
     return;
 
   if (observed_password_form->is_new_password_reliable && !IsBlacklisted()) {
+    driver_->FormEligibleForGenerationFound({
 #if defined(OS_IOS)
-    driver_->FormEligibleForGenerationFound(
-        {/*form_renderer_id*/ observed_password_form->form_data
-             .unique_renderer_id,
-         /*new_password_element_renderer_id*/
-         observed_password_form->new_password_element_renderer_id,
-         /*confirmation_password_element_renderer_id*/
-         observed_password_form->confirmation_password_element_renderer_id});
-#else
-    driver_->FormEligibleForGenerationFound(
-        {/*new_password_renderer_id*/
-         observed_password_form->new_password_element_renderer_id,
-         /*confirmation_password_renderer_id*/
-         observed_password_form->confirmation_password_element_renderer_id});
+      .form_renderer_id = observed_password_form->form_data.unique_renderer_id,
 #endif
+      .new_password_renderer_id =
+          observed_password_form->new_password_element_renderer_id,
+      .confirmation_password_renderer_id =
+          observed_password_form->confirmation_password_element_renderer_id,
+    });
   }
 
 #if defined(OS_IOS)

components/password_manager/ios/shared_password_controller_unittest.mm

@@ -315,9 +315,9 @@ TEST_F(SharedPasswordControllerTest,
               IsGenerationEnabled)
       .WillOnce(Return(true));
 
-  autofill::PasswordFormGenerationData form_generation_data(
+  autofill::PasswordFormGenerationData form_generation_data = {
       form_query.uniqueFormID, form_query.uniqueFieldID,
-      form_query.uniqueFieldID);
+      form_query.uniqueFieldID};
   [controller_ formEligibleForGenerationFound:form_generation_data];
   __block BOOL completion_was_called = NO;
   [controller_
@@ -340,8 +340,8 @@ TEST_F(SharedPasswordControllerTest,
 TEST_F(SharedPasswordControllerTest, SuggestsGeneratedPassword) {
   autofill::FormRendererId form_id(0);
   autofill::FieldRendererId field_id(1);
-  autofill::PasswordFormGenerationData form_generation_data(form_id, field_id,
-                                                            field_id);
+  autofill::PasswordFormGenerationData form_generation_data = {
+      form_id, field_id, field_id};
   [controller_ formEligibleForGenerationFound:form_generation_data];
 
   FormSuggestion* suggestion = [FormSuggestion
@@ -370,8 +370,8 @@ TEST_F(SharedPasswordControllerTest, SuggestsGeneratedPassword) {
 TEST_F(SharedPasswordControllerTest, PresavesGeneratedPassword) {
   autofill::FormRendererId form_id(0);
   autofill::FieldRendererId field_id(1);
-  autofill::PasswordFormGenerationData form_generation_data(form_id, field_id,
-                                                            field_id);
+  autofill::PasswordFormGenerationData form_generation_data = {
+      form_id, field_id, field_id};
   [controller_ formEligibleForGenerationFound:form_generation_data];
 
   FormSuggestion* suggestion = [FormSuggestion

ios/chrome/browser/passwords/password_controller_unittest.mm

@@ -411,8 +411,8 @@ class PasswordControllerTest : public ChromeWebTest {
   void InjectGeneratedPassword(FormRendererId form_id,
                                FieldRendererId field_id,
                                NSString* password) {
-    autofill::PasswordFormGenerationData generation_data(form_id, field_id,
-                                                         FieldRendererId());
+    autofill::PasswordFormGenerationData generation_data = {form_id, field_id,
+                                                            FieldRendererId()};
     [passwordController_.sharedPasswordController
         formEligibleForGenerationFound:generation_data];
     __block BOOL block_was_called = NO;