[Payments] In shipping address editor, enable required + phone validation.

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 15 matching lines @@
 #include "components/autofill/core/browser/autofill_address_util.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/country_combobox_model.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/region_combobox_model.h"
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/autofill_constants.h"
 #include "components/payments/content/payment_request_state.h"
+#include "components/strings/grit/components_strings.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/libaddressinput/chromium/chrome_metadata_source.h"
 #include "third_party/libaddressinput/chromium/chrome_storage_impl.h"
 #include "third_party/libaddressinput/messages.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/textfield/textfield.h"
 
 namespace payments {
 
 namespace {
@@ skipping 237 matching lines @@
 
   // 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)));
 }
 
 ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
     ShippingAddressValidationDelegate(
-        ShippingAddressEditorViewController* parent,
+        ShippingAddressEditorViewController* controller,
         const EditorField& field)
-    : field_(field) /* TODO(mad): Bring back when needed:, parent_(parent) */ {}
+    : field_(field), controller_(controller) {}
 
 ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
     ~ShippingAddressValidationDelegate() {}
 
 bool ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
     ValidateTextfield(views::Textfield* textfield) {
   return ValidateValue(textfield->text());
 }
 
 bool ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
     ValidateCombobox(views::Combobox* combobox) {
   return ValidateValue(combobox->GetTextForRow(combobox->selected_index()));
 }
 
 bool ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
     ValidateValue(const base::string16& value) {
-  // TODO(crbug.com/703754) add phone validation.
-  // TODO(crbug.com/703756): Display "required" error if applicable.
-  return !field_.required || !value.empty();
+  if (!value.empty()) {
+    if (field_.type == autofill::PHONE_HOME_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.
+    return true;
+  }
+
+  bool is_required_valid = !field_.required;

[MAD, 2017/03/27 13:29:13]

Why not simply return true here when !field.required?

[Mathieu, 2017/03/27 13:39:03]

I need to "clear" the suggestion if it's valid. Thanks for the question, it made
me realize that I was missing such a call on line 323.

+  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