Revert "Remove redundant OnEndEditingTextfield event"

This reverts commit 76648dac.

Reason for revert: As described in crbug.com/1056527, Android WebView still relies on this. An upstream fix is too risky so I'll revert this CL for now.

Bug: 1056527

Original change's description:
> Remove redundant OnEndEditingTextfield event
>
> The event OnEndEditingTextField seems to be redundant (esp. with focus
> changes) and isn't correct in all cases: If users interact with native
> UI like an autofill dropdown, the event will try to close this piece of
> UI although this isn't always necessary.
>
> This CL therefore removes the event which allows dropdowns to remain
> open after interaction if they require it (e.g. see use case in linked
> bug).
>
> Bug: 1043963
> Change-Id: I5c7a6ede34fb574bd3f91d4b16fbb4e2a78a8d24
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2034527
> Reviewed-by: Vadym Doroshenko <dvadym@chromium.org>
> Reviewed-by: Alex Gough <ajgo@chromium.org>
> Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
> Commit-Queue: Friedrich [CET] <fhorschig@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#738105}

TBR=vasilii@chromium.org,dvadym@chromium.org,fhorschig@chromium.org,ajgo@chromium.org

Bug: 1043963
Change-Id: I3bf88ec43fa6ae9bf0d11f295bc1b0debbba71ce
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2087331Reviewed-by: Friedrich [CET] <fhorschig@chromium.org>
Commit-Queue: Friedrich [CET] <fhorschig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746712}

chrome/browser/ui/autofill/autofill_popup_controller_impl.cc

@@ -149,6 +149,7 @@ void AutofillPopupControllerImpl::Show(
       ->RegisterKeyPressHandler(
           base::Bind(&AutofillPopupControllerImpl::HandleKeyPressEvent,
                      base::Unretained(this)));
+  pinned_until_update_ = false;
   delegate_->OnPopupShown();
 
   DCHECK_EQ(suggestions_.size(), elided_values_.size());
@@ -231,9 +232,10 @@ AutofillPopupControllerImpl::GetUnelidedSuggestions() const {
 
 void AutofillPopupControllerImpl::Hide(PopupHidingReason reason) {
   // If the reason for hiding is only stale data or a user interacting with
-  // native Chrome UI (kFocusChanged), the popup might be kept open.
+  // native Chrome UI (kFocusChanged/kEndEditing), the popup might be kept open.
   if (pinned_until_update_ && (reason == PopupHidingReason::kStaleData ||
-                               reason == PopupHidingReason::kFocusChanged)) {
+                               reason == PopupHidingReason::kFocusChanged ||
+                               reason == PopupHidingReason::kEndEditing)) {
     return;  // Don't close the popup while waiting for an update.
   }
   if (delegate_) {

chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc

@@ -701,8 +701,9 @@ TEST_F(AutofillPopupControllerUnitTest, DontHideWhenWaitingForData) {
   EXPECT_CALL(*autofill_popup_view(), Hide).Times(0);
   autofill_popup_controller_->PinViewUntilUpdate();
 
-  // Hide() will not work for stale data.
+  // Hide() will not work for stale data or when focusing native UI.
   autofill_popup_controller_->DoHide(PopupHidingReason::kStaleData);
+  autofill_popup_controller_->DoHide(PopupHidingReason::kEndEditing);
 
   // Check the expectations now since TearDown will perform a successful hide.
   Mock::VerifyAndClearExpectations(delegate());

chrome/renderer/autofill/autofill_renderer_browsertest.cc

@@ -117,6 +117,8 @@ class FakeContentAutofillDriver : public mojom::AutofillDriver {
 
   void DidPreviewAutofillFormData() override {}
 
+  void DidEndTextFieldEditing() override {}
+
   void SetDataList(const std::vector<base::string16>& values,
                    const std::vector<base::string16>& labels) override {}
 

chrome/renderer/autofill/form_autocomplete_browsertest.cc

@@ -105,6 +105,8 @@ class FakeContentAutofillDriver : public mojom::AutofillDriver {
 
   void DidPreviewAutofillFormData() override {}
 
+  void DidEndTextFieldEditing() override {}
+
   void SetDataList(const std::vector<base::string16>& values,
                    const std::vector<base::string16>& labels) override {}
 

components/autofill/content/browser/content_autofill_driver.cc

@@ -285,6 +285,10 @@ void ContentAutofillDriver::DidPreviewAutofillFormData() {
   autofill_handler_->OnDidPreviewAutofillFormData();
 }
 
+void ContentAutofillDriver::DidEndTextFieldEditing() {
+  autofill_handler_->OnDidEndTextFieldEditing();
+}
+
 void ContentAutofillDriver::SetDataList(
     const std::vector<base::string16>& values,
     const std::vector<base::string16>& labels) {

components/autofill/content/browser/content_autofill_driver.h

@@ -116,6 +116,7 @@ class ContentAutofillDriver : public AutofillDriver,
   void DidFillAutofillFormData(const FormData& form,
                                base::TimeTicks timestamp) override;
   void DidPreviewAutofillFormData() override;
+  void DidEndTextFieldEditing() override;
   void SetDataList(const std::vector<base::string16>& values,
                    const std::vector<base::string16>& labels) override;
   void SelectFieldOptionsDidChange(const FormData& form) override;

components/autofill/content/common/mojom/autofill_driver.mojom

@@ -69,6 +69,9 @@ interface AutofillDriver {
   // Sent when a form is previewed with Autofill suggestions.
   DidPreviewAutofillFormData();
 
+  // Sent when a text field is done editing.
+  DidEndTextFieldEditing();
+
   // Informs browser of data list values for the current field.
   SetDataList(array<mojo_base.mojom.String16> values,
               array<mojo_base.mojom.String16> labels);

components/autofill/content/renderer/autofill_agent.cc

@@ -319,6 +319,7 @@ void AutofillAgent::TextFieldDidEndEditing(const WebInputElement& element) {
       password_generation_agent_->ShouldIgnoreBlur()) {
     return;
   }
+  GetAutofillDriver()->DidEndTextFieldEditing();
   password_autofill_agent_->DidEndTextFieldEditing();
   if (password_generation_agent_)
     password_generation_agent_->DidEndTextFieldEditing(element);

components/autofill/core/browser/autofill_external_delegate.cc

@@ -311,6 +311,10 @@ bool AutofillExternalDelegate::RemoveSuggestion(const base::string16& value,
   return false;
 }
 
+void AutofillExternalDelegate::DidEndTextFieldEditing() {
+  manager_->client()->HideAutofillPopup(PopupHidingReason::kEndEditing);
+}
+
 void AutofillExternalDelegate::ClearPreviewedForm() {
   driver_->RendererShouldClearPreviewedForm();
 }

components/autofill/core/browser/autofill_external_delegate.h

@@ -94,6 +94,10 @@ class AutofillExternalDelegate : public AutofillPopupDelegate {
       const std::vector<base::string16>& data_list_values,
       const std::vector<base::string16>& data_list_labels);
 
+  // Inform the delegate that the text field editing has ended. This is
+  // used to help record the metrics of when a new popup is shown.
+  void DidEndTextFieldEditing();
+
   // Returns the delegate to its starting state by removing any page specific
   // values or settings.
   void Reset();

components/autofill/core/browser/autofill_external_delegate_unittest.cc

@@ -572,6 +572,17 @@ TEST_F(AutofillExternalDelegateUnitTest, ExternalDelegateClearPreviewedForm) {
                                           POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY);
 }
 
+// Test that the popup is hidden once we are done editing the autofill field.
+TEST_F(AutofillExternalDelegateUnitTest,
+       ExternalDelegateHidePopupAfterEditing) {
+  EXPECT_CALL(autofill_client_, ShowAutofillPopup);
+  test::GenerateTestAutofillPopup(external_delegate_.get());
+
+  EXPECT_CALL(autofill_client_,
+              HideAutofillPopup(autofill::PopupHidingReason::kEndEditing));
+  external_delegate_->DidEndTextFieldEditing();
+}
+
 // Test that the driver is directed to accept the data list after being notified
 // that the user accepted the data list suggestion.
 TEST_F(AutofillExternalDelegateUnitTest,

components/autofill/core/browser/autofill_handler.h

@@ -102,6 +102,9 @@ class AutofillHandler {
   // Invoked when preview autofill value has been shown.
   virtual void OnDidPreviewAutofillFormData() = 0;
 
+  // Invoked when textfeild editing ended
+  virtual void OnDidEndTextFieldEditing() = 0;
+
   // Invoked when popup window should be hidden.
   virtual void OnHidePopup() = 0;
 

components/autofill/core/browser/autofill_handler_proxy.cc

@@ -86,6 +86,8 @@ void AutofillHandlerProxy::OnDidFillAutofillFormData(
 
 void AutofillHandlerProxy::OnDidPreviewAutofillFormData() {}
 
+void AutofillHandlerProxy::OnDidEndTextFieldEditing() {}
+
 void AutofillHandlerProxy::OnHidePopup() {}
 
 void AutofillHandlerProxy::OnSetDataList(

components/autofill/core/browser/autofill_handler_proxy.h

@@ -26,6 +26,7 @@ class AutofillHandlerProxy : public AutofillHandler {
                                  const base::TimeTicks timestamp) override;
 
   void OnDidPreviewAutofillFormData() override;
+  void OnDidEndTextFieldEditing() override;
   void OnHidePopup() override;
   void OnSetDataList(const std::vector<base::string16>& values,
                      const std::vector<base::string16>& labels) override;

components/autofill/core/browser/autofill_manager.cc

@@ -1416,6 +1416,10 @@ void AutofillManager::OnCreditCardFetched(bool did_succeed,
                      credit_card_field_, *credit_card, cvc);
 }
 
+void AutofillManager::OnDidEndTextFieldEditing() {
+  external_delegate_->DidEndTextFieldEditing();
+}
+
 bool AutofillManager::IsAutofillEnabled() const {
   return IsAutofillProfileEnabled() || IsAutofillCreditCardEnabled();
 }

components/autofill/core/browser/autofill_manager.h

@@ -226,6 +226,7 @@ class AutofillManager : public AutofillHandler,
   void OnDidFillAutofillFormData(const FormData& form,
                                  const base::TimeTicks timestamp) override;
   void OnDidPreviewAutofillFormData() override;
+  void OnDidEndTextFieldEditing() override;
   void OnHidePopup() override;
   void OnSetDataList(const std::vector<base::string16>& values,
                      const std::vector<base::string16>& labels) override;

components/autofill/core/browser/ui/popup_types.h

@@ -23,7 +23,8 @@ enum class PopupType {
 enum class PopupHidingReason {
   kAcceptSuggestion,        // A suggestion was accepted.
   kAttachInterstitialPage,  // An interstitial page displaces the popup.
-  kFocusChanged,            // Focus removed from field.
+  kEndEditing,    // A field isn't edited anymore but remains focused for now.
+  kFocusChanged,  // Focus removed from field. Follows kEndEditing.
   kContentAreaMoved,  // Scrolling or zooming into the page displaces popup.
   kNavigation,        // A navigation on page or frame level.
   kNoSuggestions,     // The popup is or would become empty.