Allows profile import from forms with 'confirm email' field

components/autofill/browser/personal_data_manager.cc

 // Copyright (c) 2012 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 "components/autofill/browser/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
@@ skipping 96 matching lines @@
 }
 
 // Return true if the |field_type| and |value| are valid within the context
 // of importing a form.
 bool IsValidFieldTypeAndValue(const std::set<AutofillFieldType>& types_seen,
                               AutofillFieldType field_type,
                               const string16& value) {
   // Abandon the import if two fields of the same type are encountered.
   // This indicates ambiguous data or miscategorization of types.
   // Make an exception for PHONE_HOME_NUMBER however as both prefix and
-  // suffix are stored against this type.
-  if (types_seen.count(field_type) && field_type != PHONE_HOME_NUMBER)
+  // suffix are stored against this type, and for EMAIL_ADDRESS because it is
+  // common to see second 'confirm email address' fields on forms.
+  if (types_seen.count(field_type) && field_type != PHONE_HOME_NUMBER &&
+      field_type != EMAIL_ADDRESS)
     return false;
 
   // Abandon the import if an email address value shows up in a field that is
   // not an email address.
   if (field_type != EMAIL_ADDRESS && autofill::IsValidEmailAddress(value))
     return false;
 
   return true;
 }
 
@@ skipping 113 matching lines @@
     string16 value = CollapseWhitespace(field->value, false);
 
     // If we don't know the type of the field, or the user hasn't entered any
     // information into the field, then skip it.
     if (!field->IsFieldFillable() || value.empty())
       continue;
 
     AutofillFieldType field_type = field->type();
     FieldTypeGroup group(AutofillType(field_type).group());
 
+    // There can be multiple email fields (e.g. in the case of 'confirm email'
+    // fields) but they must all contain the same value, else the profile is
+    // invalid.
+    if (field_type == EMAIL_ADDRESS) {
+      if (types_seen.count(field_type) &&
+          imported_profile->GetRawInfo(field_type) != value) {
+        imported_profile.reset();
+        break;
+      }
+    }
+
     // If the |field_type| and |value| don't pass basic validity checks then
     // abandon the import.
     if (!IsValidFieldTypeAndValue(types_seen, field_type, value)) {
       imported_profile.reset();
       local_imported_credit_card.reset();
       break;
     }
 
     types_seen.insert(field_type);
 
@@ skipping 724 matching lines @@
 
 void PersonalDataManager::set_metric_logger(
     const AutofillMetrics* metric_logger) {
   metric_logger_.reset(metric_logger);
 }
 
 void PersonalDataManager::set_browser_context(
     content::BrowserContext* context) {
   browser_context_ = context;
 }