[Payments] When saving an edited address in editor, clear data first.

chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc

 // Copyright 2017 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/ui/views/payments/shipping_address_editor_view_controller.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
@@ skipping 101 matching lines @@
   autofill::AutofillProfile profile;
   if (!SaveFieldsToProfile(&profile, /*ignore_errors=*/false))
     return false;
   if (!profile_to_edit_) {
     // Add the profile (will not add a duplicate).
     profile.set_origin(autofill::kSettingsOrigin);
     state()->GetPersonalDataManager()->AddProfile(profile);
     std::move(on_added_).Run(profile);
     on_edited_.Reset();
   } else {
-    // Copy the temporary object's data to the object to be edited. Prefer this
-    // method to copying |profile| into |profile_to_edit_|, because the latter
-    // object needs to retain other properties (use count, use date, guid,
+    autofill::ServerFieldTypeSet all_fields;
+    profile_to_edit_->GetSupportedTypes(&all_fields);
+    // Clear all the address data in |profile_to_edit_|, in anticipation of
+    // adding only the fields present in the editor.  Prefer this method to
+    // copying |profile| into |profile_to_edit_|, because the latter object
+    // needs to retain other properties (use count, use date, guid,
     // etc.).
+    for (autofill::ServerFieldType type : all_fields)
+      profile_to_edit_->SetRawInfo(type, base::string16());
+
     bool success = SaveFieldsToProfile(profile_to_edit_,
                                        /*ignore_errors=*/false);
     DCHECK(success);
     profile_to_edit_->set_origin(autofill::kSettingsOrigin);
     state()->GetPersonalDataManager()->UpdateProfile(*profile_to_edit_);
     state()->profile_comparator()->Invalidate(*profile_to_edit_);
     std::move(on_edited_).Run();
     on_added_.Reset();
   }
 
@@ skipping 421 matching lines @@
     return true;
   }
   if (error_message && field_.required) {
     *error_message = l10n_util::GetStringUTF16(
         IDS_PAYMENTS_FIELD_REQUIRED_VALIDATION_MESSAGE);
   }
   return !field_.required;
 }
 
 }  // namespace payments