Merge pull request #2003 from brave/pwd-autofill

Always waiting for user interaction to fill the password form in Brave

app/brave_main_delegate.cc

@@ -136,7 +136,6 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
   const std::unordered_set<const char*> enabled_features = {
       extensions_features::kNewExtensionUpdaterService.name,
       features::kDesktopPWAWindowing.name,
-      password_manager::features::kFillOnAccountSelect.name,
   };
 
   // Disabled features.

browser/brave_features_browsertest.cc

@@ -1,22 +1,16 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* Copyright (c) 2019 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "base/feature_list.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/autofill/core/common/autofill_features.h"
-#include "components/password_manager/core/common/password_manager_features.h"
 #include "components/unified_consent/feature.h"
 #include "content/public/common/content_features.h"
 
 using BraveFeaturesBrowserTest = InProcessBrowserTest;
 
-IN_PROC_BROWSER_TEST_F(BraveFeaturesBrowserTest, AutoFillPasswordDefault) {
-  EXPECT_TRUE(
-    base::FeatureList::IsEnabled(
-      password_manager::features::kFillOnAccountSelect));
-}
-
 IN_PROC_BROWSER_TEST_F(BraveFeaturesBrowserTest, AutoFillServerCommunication) {
   EXPECT_FALSE(
     base::FeatureList::IsEnabled(

patches/components-password_manager-core-browser-password_form_filling.cc.patch

@@ -0,0 +1,14 @@
+diff --git a/components/password_manager/core/browser/password_form_filling.cc b/components/password_manager/core/browser/password_form_filling.cc
+index d234228194e800046f8db8ee90e8baa97af8dc0f..2cc1cd29e69a91f7fdd9c3e2d1b66a730c48a7ac 100644
+--- a/components/password_manager/core/browser/password_form_filling.cc
++++ b/components/password_manager/core/browser/password_form_filling.cc
+@@ -190,6 +190,9 @@ LikelyFormFilling SendFillInformationToRenderer(
+
+   bool wait_for_username =
+       wait_for_username_reason != WaitForUsernameReason::kDontWait;
++#if defined(BRAVE_CHROMIUM_BUILD)
++  wait_for_username = true;
++#endif
+
+   if (wait_for_username) {
+     metrics_recorder->SetManagerAction(