Autofill should not allow overwrite of field data when merging profile data

chrome/browser/autofill/autofill_profile.cc

 // Copyright (c) 2010 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/autofill/autofill_profile.h"
 
 #include <algorithm>
 #include <list>
 #include <map>
 #include <set>
@@ skipping 416 matching lines @@
 
   return Compare(profile) == 0;
 }
 
 bool AutoFillProfile::operator!=(const AutoFillProfile& profile) const {
   return !operator==(profile);
 }
 
 const string16 AutoFillProfile::PrimaryValue() const {
   return GetFieldText(AutoFillType(NAME_FULL)) +
-         GetFieldText(AutoFillType(ADDRESS_HOME_LINE1));
+         GetFieldText(AutoFillType(ADDRESS_HOME_LINE1)) +
+         GetFieldText(AutoFillType(ADDRESS_HOME_LINE2)) +
+         GetFieldText(AutoFillType(EMAIL_ADDRESS));
 }
 
 Address* AutoFillProfile::GetHomeAddress() {
   return static_cast<Address*>(personal_info_[AutoFillType::ADDRESS_HOME]);
 }
 
 string16 AutoFillProfile::ConstructInferredLabel(
     const std::vector<AutoFillFieldType>* included_fields) const {
   DCHECK(included_fields);
   string16 label;
@@ skipping 45 matching lines @@
       << UTF16ToUTF8(profile.GetFieldText(AutoFillType(ADDRESS_HOME_ZIP)))
       << " "
       << UTF16ToUTF8(profile.GetFieldText(AutoFillType(ADDRESS_HOME_COUNTRY)))
       << " "
       << UTF16ToUTF8(profile.GetFieldText(AutoFillType(
              PHONE_HOME_WHOLE_NUMBER)))
       << " "
       << UTF16ToUTF8(profile.GetFieldText(AutoFillType(
              PHONE_FAX_WHOLE_NUMBER)));
 }