[Password Autofill] Disable one click popup on Android.

This is a temporary fix to a bug where the popup is shown then immediately
hidden as a result of the keyboard showing. Reverting to the old two click
behavior, on Android only, until we can fix the underlying issue.

BUG=423464

Review URL: https://codereview.chromium.org/695953003

Cr-Commit-Position: refs/heads/master@{#302537}

2 files changed, 21 insertions, 7 deletions

diff --git a/chrome/renderer/autofill/password_autofill_agent_browsertest.cc b/chrome/renderer/autofill/password_autofill_agent_browsertest.cc
index 451b1fc..0c0a81b 100644
--- a/chrome/renderer/autofill/password_autofill_agent_browsertest.cc
+++ b/chrome/renderer/autofill/password_autofill_agent_browsertest.cc
@@ -1442,6 +1442,9 @@ TEST_F(PasswordAutofillAgentTest, SendsLoggingStateUpdatePingOnConstruction) {
   EXPECT_TRUE(message);
 }
 
+// TODO(gcasto): Re-enabled these tests after crbug.com/423464 has been fixed.
+#if !defined(OS_ANDROID)
+
 // Tests that one user click on a username field is sufficient to bring up a
 // credential suggestion popup, and the user can autocomplete the password by
 // selecting the credential from the popup.
@@ -1503,6 +1506,8 @@ TEST_F(PasswordAutofillAgentTest, CredentialsOnClick) {
   ExpectAllCredentials();
 }
 
+#endif  // !defined(OS_ANDROID)
+
 // The user types in a password, but then just before sending the form off, a
 // script clears that password. This test checks that PasswordAutofillAgent can
 // still remember the password typed by the user.
diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc
index 0a9b57f..2f59e54 100644
--- a/components/autofill/content/renderer/autofill_agent.cc
+++ b/components/autofill/content/renderer/autofill_agent.cc
@@ -318,13 +318,22 @@ void AutofillAgent::FormControlElementClicked(
 
   bool show_full_suggestion_list = element.isAutofilled() || was_focused;
   bool show_password_suggestions_only = !was_focused;
-  ShowSuggestions(element,
-                  true,
-                  false,
-                  true,
-                  false,
-                  show_full_suggestion_list,
-                  show_password_suggestions_only);
+
+  // TODO(gcasto): Remove after crbug.com/423464 has been fixed.
+  bool show_suggestions = true;
+#if defined(OS_ANDROID)
+  show_suggestions = was_focused;
+#endif
+
+  if (show_suggestions) {
+    ShowSuggestions(element,
+                    true,
+                    false,
+                    true,
+                    false,
+                    show_full_suggestion_list,
+                    show_password_suggestions_only);
+  }
 }
 
 void AutofillAgent::textFieldDidEndEditing(const WebInputElement& element) {