Add billing address as a mandatory field of Payments credit cards.

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

Index: chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc
diff --git a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc
index 19d1039e56b570569606fe7eda6a4c8d3f415f1c..4c9b88d474c6b210cb770a8469332411dd9b0ed7 100644
--- a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc
+++ b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc
@@ -13,6 +13,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
+#include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
 #include "chrome/browser/ui/views/payments/validating_combobox.h"
 #include "chrome/browser/ui/views/payments/validating_textfield.h"
 #include "chrome/grit/generated_resources.h"
@@ -68,10 +69,11 @@ ShippingAddressEditorViewController::ShippingAddressEditorViewController(
     PaymentRequestSpec* spec,
     PaymentRequestState* state,
     PaymentRequestDialogView* dialog,
+    BackNavigationType back_navigation_type,
     base::OnceClosure on_edited,
     base::OnceCallback<void(const autofill::AutofillProfile&)> on_added,
     autofill::AutofillProfile* profile)
-    : EditorViewController(spec, state, dialog),
+    : EditorViewController(spec, state, dialog, back_navigation_type),
       on_edited_(std::move(on_edited)),
       on_added_(std::move(on_added)),
       profile_to_edit_(profile),
@@ -87,6 +89,11 @@ ShippingAddressEditorViewController::CreateHeaderView() {
   return base::MakeUnique<views::View>();
 }
 
+std::unique_ptr<views::View>
+ShippingAddressEditorViewController::CreateCustomFieldsView() {

[Mathieu, 2017/05/04 20:29:19]

A pattern that we sometimes use is that you could have the base implementation
of this return nullptr in EditorViewController, and when it's time to use it,
do.

... custom_view = CreateCustomFieldsView();
if (custom_view) {
  view->AddChildView(custom_view);
}

You would then avoid these empty implementations.

[MAD, 2017/05/05 00:50:07]

I was following the pattern used by other similar methods (e.g.,
CreateHeaderView). Should we change those other too?

[Mathieu, 2017/05/05 13:51:33]

I have a slightly preference for what I suggested because otherwise you are
adding empty views to the layout, which is theoretically more work. But I agree
with you it's not done consistently.

Also this way, it makes it so that some subclasses don't have to override
CreateCustomFieldsView if they don't need to.

[MAD, 2017/05/05 18:32:34]

OK, then I'll change all the others too.
Note that for the custom fields, it should only be called when a derived class
has explicitly specified it needed one.

+  return base::MakeUnique<views::View>();
+}
+
 std::vector<EditorField>
 ShippingAddressEditorViewController::GetFieldDefinitions() {
   return editor_fields_;
@@ -113,7 +120,6 @@ bool ShippingAddressEditorViewController::ValidateModelAndSave() {
   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);
@@ -223,6 +229,14 @@ base::string16 ShippingAddressEditorViewController::GetSheetTitle() {
                           : l10n_util::GetStringUTF16(IDS_PAYMENTS_ADD_ADDRESS);
 }
 
+std::unique_ptr<views::Button>
+ShippingAddressEditorViewController::CreatePrimaryButton() {
+  std::unique_ptr<views::Button> button(
+      EditorViewController::CreatePrimaryButton());
+  button->set_id(static_cast<int>(DialogViewID::SAVE_ADDRESS_BUTTON));
+  return button;
+}
+
 void ShippingAddressEditorViewController::UpdateEditorFields() {
   editor_fields_.clear();
   std::string chosen_country_code;
@@ -412,7 +426,6 @@ bool ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
     controller_->DisplayErrorMessageForField(field_, base::ASCIIToUTF16(""));
     return true;
   }
-
   bool is_required_valid = !field_.required;
   const base::string16 displayed_message =
       is_required_valid ? base::ASCIIToUTF16("")