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

chrome/browser/password_manager/chrome_password_manager_client.cc

 // Copyright 2014 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 "chrome/browser/password_manager/chrome_password_manager_client.h"
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
@@ skipping 73 matching lines @@
   if (manage_passwords_bubble_ui_controller &&
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableSavePasswordBubble)) {
     manage_passwords_bubble_ui_controller->OnPasswordAutofilled(best_matches);
   }
 }
 
 void ChromePasswordManagerClient::AuthenticateAutofillAndFillForm(
       scoped_ptr<autofill::PasswordFormFillData> fill_data) {
 #if defined(OS_ANDROID)
-  if (PasswordAuthenticationManager
-      ::IsAutofillPasswordAuthenticationEnabled()) {
-    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())));
+#else
   // 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() {
   return Profile::FromBrowserContext(web_contents_->GetBrowserContext());
 }
 
 PrefService* ChromePasswordManagerClient::GetPrefs() {
   return GetProfile()->GetPrefs();
 }
 
@@ skipping 52 matching lines @@
       ChromePasswordManagerClient::FromWebContents(contents);
   if (!client)
     return NULL;
   return client->GetDriver()->GetPasswordManager();
 }
 
 void ChromePasswordManagerClient::CommitFillPasswordForm(
     autofill::PasswordFormFillData* data) {
   driver_.FillPasswordForm(*data);
 }