[Merge m56][autofill] Merge can select the wrong address.

components/autofill/core/browser/autofill_profile_comparator.cc

 // Copyright 2016 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/core/browser/autofill_profile_comparator.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/i18n/case_conversion.h"
@@ skipping 530 matching lines @@
               kStreetAddress,
               (p2.use_date() > p1.use_date() ? address2 : address1),
               app_locale_);
           break;
         case S1_CONTAINS_S2:
           // address1 has more unique tokens than address2.
           address->SetInfo(kStreetAddress, address1, app_locale_);
           break;
         case S2_CONTAINS_S1:
           // address2 has more unique tokens than address1.
-          address->SetInfo(kStreetAddress, address1, app_locale_);
+          address->SetInfo(kStreetAddress, address2, app_locale_);
           break;
         case DIFFERENT_TOKENS:
         default:
           // The addresses aren't mergeable and we shouldn't be doing any of
           // this.
           NOTREACHED();
           return false;
       }
     }
   }
@@ skipping 300 matching lines @@
   const base::string16& address2 = rewriter.Rewrite(NormalizeForComparison(
       p2.GetInfo(AutofillType(ADDRESS_HOME_STREET_ADDRESS), app_locale_)));
   if (CompareTokens(address1, address2) == DIFFERENT_TOKENS) {
     return false;
   }
 
   return true;
 }
 
 }  // namespace autofill