Always call into the embedder for password autofill auth if password uses it.

chrome/browser/password_manager/chrome_password_manager_client.cc

Index: chrome/browser/password_manager/chrome_password_manager_client.cc
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
index 51ee6be440a6c22fb43e60429809ce22c04393d3..33e31b07c5d45596bec69290a329ff92e98a741c 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -91,20 +91,16 @@ void ChromePasswordManagerClient::PasswordWasAutofilled(
 void ChromePasswordManagerClient::AuthenticateAutofillAndFillForm(
       scoped_ptr<autofill::PasswordFormFillData> fill_data) {
 #if defined(OS_ANDROID)
-  if (PasswordAuthenticationManager
-      ::IsAutofillPasswordAuthenticationEnabled()) {

[Garrett Casto, 2014/02/18 21:32:10]

Is there any reason for this function to still exist?

[Ted C, 2014/02/18 21:38:07]

We use that function for checking whether or not to show the "additional
authentication" checkbox in the infobar.

[Garrett Casto, 2014/02/18 22:42:12]

Do you mean SavePasswordInfoBar.java? It looks like that references the Java
PasswordAuthenticationManager, not the C++ class.

-    PasswordAuthenticationManager::AuthenticatePasswordAutofill(
-        web_contents_,
-        base::Bind(&ChromePasswordManagerClient::CommitFillPasswordForm,
-                   weak_factory_.GetWeakPtr(),
-                   base::Owned(fill_data.release())));
-    return;
-  }
-#endif  // OS_ANDROID
-
+  PasswordAuthenticationManager::AuthenticatePasswordAutofill(
+      web_contents_,
+      base::Bind(&ChromePasswordManagerClient::CommitFillPasswordForm,
+                 weak_factory_.GetWeakPtr(),
+                 base::Owned(fill_data.release())));
+#elif
   // Additional authentication is currently only available for Android, so all
   // other plaftorms should just fill the password form directly.
   CommitFillPasswordForm(fill_data.get());
+#endif  // OS_ANDROID
 }
 
 Profile* ChromePasswordManagerClient::GetProfile() {