Don't import empty passwords from Firefox.

BUG=404012

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

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

2 files changed, 5 insertions, 10 deletions

diff --git a/chrome/utility/importer/external_process_importer_bridge.cc b/chrome/utility/importer/external_process_importer_bridge.cc
index fcfc61f..0ea6971 100644
--- a/chrome/utility/importer/external_process_importer_bridge.cc
+++ b/chrome/utility/importer/external_process_importer_bridge.cc
@@ -28,14 +28,6 @@ const int kNumHistoryRowsToSend = 100;
 const int kNumFaviconsToSend = 100;
 const int kNumAutofillFormDataToSend = 100;
 
-// http://crbug.com/404012. Let's see where the empty fields come from.
-void CheckForEmptyUsernameAndPassword(const autofill::PasswordForm& form) {
-  if (form.username_value.empty() &&
-      form.password_value.empty() &&
-      !form.blacklisted_by_user) {
-    base::debug::DumpWithoutCrashing();
-  }
-}
 } // namespace
 
 ExternalProcessImporterBridge::ExternalProcessImporterBridge(
@@ -148,7 +140,6 @@ void ExternalProcessImporterBridge::SetFirefoxSearchEnginesXMLData(
 
 void ExternalProcessImporterBridge::SetPasswordForm(
     const autofill::PasswordForm& form) {
-  CheckForEmptyUsernameAndPassword(form);
   Send(new ProfileImportProcessHostMsg_NotifyPasswordFormReady(form));
 }
 
diff --git a/chrome/utility/importer/firefox_importer.cc b/chrome/utility/importer/firefox_importer.cc
index fdb14cd..728f51d 100644
--- a/chrome/utility/importer/firefox_importer.cc
+++ b/chrome/utility/importer/firefox_importer.cc
@@ -370,7 +370,11 @@ void FirefoxImporter::ImportPasswords() {
 
   if (!cancelled()) {
     for (size_t i = 0; i < forms.size(); ++i) {
-      bridge_->SetPasswordForm(forms[i]);
+      if (!forms[i].username_value.empty() ||
+          !forms[i].password_value.empty() ||
+          forms[i].blacklisted_by_user) {
+        bridge_->SetPasswordForm(forms[i]);
+      }
     }
   }
 }