Update payment phone type for shipping address

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 <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 75 matching lines @@
 
 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()) {
+  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() {
   // To validate the profile first, we use a temporary object.
@@ skipping 182 matching lines @@
             autofill::ADDRESS_HOME_COUNTRY,
             l10n_util::GetStringUTF16(
                 IDS_LIBADDRESSINPUT_COUNTRY_OR_REGION_LABEL),
             EditorField::LengthHint::HINT_LONG, /*required=*/true,
             EditorField::ControlType::COMBOBOX);
       }
     }
   }
   // Always add phone number at the end.
   editor_fields_.emplace_back(
-      autofill::PHONE_HOME_NUMBER,
+      autofill::PHONE_HOME_WHOLE_NUMBER,
       l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_PHONE),
-      EditorField::LengthHint::HINT_LONG, /*required=*/false,
+      EditorField::LengthHint::HINT_LONG, /*required=*/true,
       EditorField::ControlType::TEXTFIELD);
 }
 
 void ShippingAddressEditorViewController::OnDataChanged(bool synchronous) {
   temporary_profile_.reset(new autofill::AutofillProfile);
   SaveFieldsToProfile(temporary_profile_.get(), /*ignore_errors*/ true);
 
   UpdateEditorFields();
   if (synchronous) {
     UpdateEditorView();
   } else {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::BindOnce(&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;
+    } else {
+      success = profile->SetInfo(autofill::AutofillType(field.second.type),
+                                 field.first->text(), locale);
     }
-    profile->SetInfo(autofill::AutofillType(field.second.type),
-                     field.first->text(), locale);
+    DCHECK(success || ignore_errors)
+        << "Can't setinfo(" << field.second.type << ", " << field.first->text();
+    if (!success && !ignore_errors)
+      return false;
   }
   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;
+    } else {
+      if (combobox->id() == autofill::ADDRESS_HOME_COUNTRY) {
+        success = profile->SetInfo(
+            autofill::AutofillType(field.second.type),
+            base::UTF8ToUTF16(country_codes_[combobox->selected_index()]),
+            locale);
+      } else {
+        success = profile->SetInfo(
+            autofill::AutofillType(field.second.type),
+            combobox->GetTextForRow(combobox->selected_index()), locale);
+      }
     }
+    DCHECK(success || ignore_errors)
+        << "Can't setinfo(" << field.second.type << ", "
 
-    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);
-    }
+        << combobox->GetTextForRow(combobox->selected_index());
+    if (!success && !ignore_errors)
+      return false;
   }
   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());
@@ skipping 32 matching lines @@
 }
 
 void ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
     ComboboxModelChanged(views::Combobox* combobox) {
   controller_->OnComboboxModelChanged(combobox);
 }
 
 bool ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
     ValidateValue(const base::string16& value) {
   if (!value.empty()) {
-    if (field_.type == autofill::PHONE_HOME_NUMBER &&
+    if (field_.type == autofill::PHONE_HOME_WHOLE_NUMBER &&
         !autofill::IsValidPhoneNumber(
             value,
             controller_->country_codes_[controller_->chosen_country_index_])) {
       controller_->DisplayErrorMessageForField(
           field_, l10n_util::GetStringUTF16(
                       IDS_PAYMENTS_PHONE_INVALID_VALIDATION_MESSAGE));
       return false;
     }
     // As long as other field types are non-empty, they are valid.
     controller_->DisplayErrorMessageForField(field_, base::ASCIIToUTF16(""));
     return true;
   }
   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