Removed unused member, replaced std::unique_ptr with base::Optional.

- |ignore_text_changes_| was not used anywhere.
- |provisionally_saved_form_| was a std::unique_ptr<FormData> only to
  model optionality.

Bug: 1007974
Change-Id: I1369b1d98e639acb8068ef7c5e51bc494a6b43ff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036061Reviewed-by: Vadym Doroshenko <dvadym@chromium.org>
Commit-Queue: Christoph Schwering <schwering@google.com>
Cr-Commit-Position: refs/heads/master@{#738189}

components/autofill/content/renderer/autofill_agent.cc

@@ -138,7 +138,6 @@ AutofillAgent::AutofillAgent(content::RenderFrame* render_frame,
       password_generation_agent_(password_generation_agent),
       autofill_query_id_(0),
       query_node_autofill_state_(WebAutofillState::kNotFilled),
-      ignore_text_changes_(false),
       is_popup_possibly_visible_(false),
       is_generation_popup_possibly_visible_(false),
       is_user_gesture_required_(true),
@@ -993,8 +992,8 @@ void AutofillAgent::OnProvisionallySaveForm(
         }
       }
       formless_elements_user_edited_.insert(element);
-      provisionally_saved_form_ = std::make_unique<FormData>();
-      if (!CollectFormlessElements(provisionally_saved_form_.get())) {
+      provisionally_saved_form_ = base::make_optional<FormData>();
+      if (!CollectFormlessElements(&provisionally_saved_form_.value())) {
         provisionally_saved_form_.reset();
       } else {
         last_interacted_form_.Reset();
@@ -1049,9 +1048,9 @@ void AutofillAgent::OnInferredFormSubmission(SubmissionSource source) {
   if (source == SubmissionSource::FRAME_DETACHED) {
     // Should not access the frame because it is now detached. Instead, use
     // |provisionally_saved_form_|.
-    if (provisionally_saved_form_)
-      FireHostSubmitEvents(*provisionally_saved_form_, /*known_success=*/true,
-                           source);
+    if (provisionally_saved_form_.has_value())
+      FireHostSubmitEvents(provisionally_saved_form_.value(),
+                           /*known_success=*/true, source);
   } else {
     FormData form_data;
     if (GetSubmittedForm(&form_data))
@@ -1073,8 +1072,8 @@ bool AutofillAgent::GetSubmittedForm(FormData* form) {
   if (!last_interacted_form_.IsNull()) {
     if (form_util::ExtractFormData(last_interacted_form_, form)) {
       return true;
-    } else if (provisionally_saved_form_) {
-      *form = *provisionally_saved_form_;
+    } else if (provisionally_saved_form_.has_value()) {
+      *form = provisionally_saved_form_.value();
       return true;
     }
   } else if (formless_elements_user_edited_.size() != 0 &&
@@ -1086,8 +1085,8 @@ bool AutofillAgent::GetSubmittedForm(FormData* form) {
     // construct form.
     if (CollectFormlessElements(form)) {
       return true;
-    } else if (provisionally_saved_form_) {
-      *form = *provisionally_saved_form_;
+    } else if (provisionally_saved_form_.has_value()) {
+      *form = provisionally_saved_form_.value();
       return true;
     }
   }
@@ -1103,9 +1102,9 @@ void AutofillAgent::ResetLastInteractedElements() {
 
 void AutofillAgent::UpdateLastInteractedForm(blink::WebFormElement form) {
   last_interacted_form_ = form;
-  provisionally_saved_form_ = std::make_unique<FormData>();
+  provisionally_saved_form_ = base::make_optional<FormData>();
   if (!form_util::ExtractFormData(last_interacted_form_,
-                                  provisionally_saved_form_.get())) {
+                                  &provisionally_saved_form_.value())) {
     provisionally_saved_form_.reset();
   }
 }

components/autofill/content/renderer/autofill_agent.h

@@ -11,6 +11,7 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "base/optional.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
@@ -35,7 +36,7 @@ class WebView;
 class WebFormControlElement;
 template <typename T>
 class WebVector;
-}
+}  // namespace blink
 
 namespace autofill {
 
@@ -310,7 +311,7 @@ class AutofillAgent : public content::RenderFrameObserver,
 
   // The form user interacted, it is used if last_interacted_form_ or formless
   // form can't be converted to FormData at the time of form submission.
-  std::unique_ptr<FormData> provisionally_saved_form_;
+  base::Optional<FormData> provisionally_saved_form_;
 
   // Keeps track of the forms for which form submitted event has been sent to
   // AutofillDriver. We use it to avoid fire duplicated submission event when
@@ -323,11 +324,6 @@ class AutofillAgent : public content::RenderFrameObserver,
   // The query node autofill state prior to previewing the form.
   blink::WebAutofillState query_node_autofill_state_;
 
-  // Whether or not to ignore text changes.  Useful for when we're committing
-  // a composition when we are defocusing the WebView and we don't want to
-  // trigger an autofill popup to show.
-  bool ignore_text_changes_;
-
   // Whether the Autofill popup is possibly visible.  This is tracked as a
   // performance improvement, so that the IPC channel isn't flooded with
   // messages to close the Autofill popup when it can't possibly be showing.