Restore Payments shipping address info when changing country

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 <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 78 matching lines @@
   return base::MakeUnique<views::View>();
 }
 
 std::vector<EditorField>
 ShippingAddressEditorViewController::GetFieldDefinitions() {
   return editor_fields_;
 }
 
 base::string16 ShippingAddressEditorViewController::GetInitialValueForType(
     autofill::ServerFieldType type) {
+  // Temporary profile has precedence over profile to edit since its existence
+  // is based on having unsaved stated to restore.
+  if (temporary_profile_.get()) {
+    return temporary_profile_->GetInfo(autofill::AutofillType(type),
+                                       state()->GetApplicationLocale());
+  }
+
   if (!profile_to_edit_)
     return base::string16();
 
   return profile_to_edit_->GetInfo(autofill::AutofillType(type),
                                    state()->GetApplicationLocale());
 }
 
 bool ShippingAddressEditorViewController::ValidateModelAndSave() {
-  const std::string& locale = state()->GetApplicationLocale();
   // To validate the profile first, we use a temporary object.
   autofill::AutofillProfile profile;
-  for (const auto& field : text_fields()) {
-    // Force a blur in case the value was left untouched.
-    field.first->OnBlur();
-    // ValidatingTextfield* is the key, EditorField is the value.
-    if (field.first->invalid())
-      return false;
-
-    profile.SetInfo(autofill::AutofillType(field.second.type),
-                    field.first->text(), locale);
-  }
-  for (const auto& field : comboboxes()) {
-    // ValidatingCombobox* is the key, EditorField is the value.
-    ValidatingCombobox* combobox = field.first;
-    if (combobox->invalid())
-      return false;
-
-    if (combobox->id() == autofill::ADDRESS_HOME_COUNTRY) {
-      profile.SetInfo(
-          autofill::AutofillType(field.second.type),
-          base::UTF8ToUTF16(country_codes_[combobox->selected_index()]),
-          locale);
-    } else {
-      profile.SetInfo(autofill::AutofillType(field.second.type),
-                      combobox->GetTextForRow(combobox->selected_index()),
-                      locale);
-    }
-  }
+  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);
   } 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,
     // etc.).
-    for (const auto& field : text_fields()) {
-      profile_to_edit_->SetInfo(
-          autofill::AutofillType(field.second.type),
-          profile.GetInfo(autofill::AutofillType(field.second.type), locale),
-          locale);
-    }
-    for (const auto& field : comboboxes()) {
-      profile_to_edit_->SetInfo(
-          autofill::AutofillType(field.second.type),
-          profile.GetInfo(autofill::AutofillType(field.second.type), locale),
-          locale);
-    }
+    bool success = SaveFieldsToProfile(profile_to_edit_,
+                                       /*ignore_errors=*/false);
+    DCHECK(success);
     profile_to_edit_->set_origin(autofill::kSettingsOrigin);
     state()->GetPersonalDataManager()->UpdateProfile(*profile_to_edit_);
   }
 
   return true;
 }
 
 std::unique_ptr<ValidationDelegate>
 ShippingAddressEditorViewController::CreateValidationDelegate(
     const EditorField& field) {
@@ skipping 58 matching lines @@
 }
 
 void ShippingAddressEditorViewController::UpdateEditorView() {
   EditorViewController::UpdateEditorView();
   if (chosen_country_index_ > 0UL) {
     views::Combobox* country_combo_box = static_cast<views::Combobox*>(
         dialog()->GetViewByID(autofill::ADDRESS_HOME_COUNTRY));
     DCHECK(country_combo_box);
     country_combo_box->SetSelectedIndex(chosen_country_index_);
   }
+  // Ignore temporary profile once the editor view has been updated.
+  temporary_profile_.reset(nullptr);
 }
 
 base::string16 ShippingAddressEditorViewController::GetSheetTitle() {
   return l10n_util::GetStringUTF16(
       IDS_PAYMENT_REQUEST_ADDRESS_EDITOR_ADD_TITLE);
 }
 
 void ShippingAddressEditorViewController::UpdateEditorFields() {
   editor_fields_.clear();
   std::string chosen_country_code;
@@ skipping 66 matching lines @@
   }
   // Always add phone number at the end.
   editor_fields_.emplace_back(
       autofill::PHONE_HOME_NUMBER,
       l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_PHONE),
       EditorField::LengthHint::HINT_LONG, /*required=*/false,
       EditorField::ControlType::TEXTFIELD);
 }
 
 void ShippingAddressEditorViewController::OnDataChanged() {
-  // TODO(crbug.com/703764): save the current state so we can map it to the new
-  // country fields as best we can.
+  temporary_profile_.reset(new autofill::AutofillProfile);
+
+  SaveFieldsToProfile(temporary_profile_.get(), /*ignore_errors*/ true);
   UpdateEditorFields();
 
   // The editor can't be updated while in the middle of a combobox event.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&ShippingAddressEditorViewController::UpdateEditorView,
                  base::Unretained(this)));
 }
 
+bool ShippingAddressEditorViewController::SaveFieldsToProfile(
+    autofill::AutofillProfile* profile,
+    bool ignore_errors) {
+  const std::string& locale = state()->GetApplicationLocale();
+  bool success = true;
+  for (const auto& field : text_fields()) {
+    // Force a blur in case the value was left untouched.
+    field.first->OnBlur();
+    // ValidatingTextfield* is the key, EditorField is the value.
+    if (field.first->invalid()) {
+      success = false;
+      if (!ignore_errors)
+        return false;
+    }
+    profile->SetInfo(autofill::AutofillType(field.second.type),
+                     field.first->text(), locale);
+  }
+  for (const auto& field : comboboxes()) {
+    // ValidatingCombobox* is the key, EditorField is the value.
+    ValidatingCombobox* combobox = field.first;
+    if (combobox->invalid()) {
+      success = false;
+      if (!ignore_errors)
+        return false;
+    }
+
+    if (combobox->id() == autofill::ADDRESS_HOME_COUNTRY) {
+      profile->SetInfo(
+          autofill::AutofillType(field.second.type),
+          base::UTF8ToUTF16(country_codes_[combobox->selected_index()]),
+          locale);
+    } else {
+      profile->SetInfo(autofill::AutofillType(field.second.type),
+                       combobox->GetTextForRow(combobox->selected_index()),
+                       locale);
+    }
+  }
+  return success;
+}
+
 void ShippingAddressEditorViewController::OnComboboxModelChanged(
     views::Combobox* combobox) {
   if (combobox->id() != autofill::ADDRESS_HOME_STATE)
     return;
   autofill::RegionComboboxModel* model =
       static_cast<autofill::RegionComboboxModel*>(combobox->model());
   if (model->pending_region_data_load())
     return;
   if (model->failed_to_load_data()) {
     failed_to_load_region_data_ = true;
@@ skipping 45 matching lines @@
   bool is_required_valid = !field_.required;
   const base::string16 displayed_message =
       is_required_valid ? base::ASCIIToUTF16("")
                         : l10n_util::GetStringUTF16(
                               IDS_PAYMENTS_FIELD_REQUIRED_VALIDATION_MESSAGE);
   controller_->DisplayErrorMessageForField(field_, displayed_message);
   return is_required_valid;
 }
 
 }  // namespace payments