The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/a363e3bdb058af7d9da96c5a7d27c192632e2ada

commit a363e3bdb058af7d9da96c5a7d27c192632e2ada
Author: Anthony Vallee-Dubois <anthonyvd@chromium.org>
Date: Thu May 25 22:34:28 2017

[Web Payments] Allow updating server card expiration date

Bug:  726394 
Change-Id: I02076291db7cbe9ab6fa54653a48f2375c89d491
Reviewed-on: https://chromium-review.googlesource.com/515903
Reviewed-by: Mathieu Perreault <mathp@chromium.org>
Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Commit-Queue: Anthony Vallee-Dubois <anthonyvd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#474824}
[modify] https://crrev.com/a363e3bdb058af7d9da96c5a7d27c192632e2ada/chrome/browser/ui/views/payments/cvc_unmask_view_controller.cc
[modify] https://crrev.com/a363e3bdb058af7d9da96c5a7d27c192632e2ada/chrome/browser/ui/views/payments/cvc_unmask_view_controller.h
[modify] https://crrev.com/a363e3bdb058af7d9da96c5a7d27c192632e2ada/chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b51a5d3890ba8be0f78209b3a8f6f5c947d99527

commit b51a5d3890ba8be0f78209b3a8f6f5c947d99527
Author: Mathieu Perreault <mathp@chromium.org>
Date: Fri May 26 20:23:03 2017

[Payments] Refactor the year and month combobox models and preselect.

Few changes:
* In CVC screen, will preselect the invalid expiration values.
* Using YearComboboxModel and MonthComboboxModel in credit card editor
* An expired card will not appear as such in the Payment Sheet and
  Payment method screens. User will have the option to fix the expiration
  at the CVC step.

Bug:  726394 
Test: unit_tests, browser_tests
Change-Id: I680e6d6978d60be6b1f6758e76e0d1b9c4b6b096
Reviewed-on: https://chromium-review.googlesource.com/516963
Commit-Queue: Mathieu Perreault <mathp@chromium.org>
Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Reviewed-by: Anthony Vallee-Dubois <anthonyvd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#475105}
[modify] https://crrev.com/b51a5d3890ba8be0f78209b3a8f6f5c947d99527/chrome/browser/ui/BUILD.gn
[modify] https://crrev.com/b51a5d3890ba8be0f78209b3a8f6f5c947d99527/chrome/browser/ui/autofill/autofill_dialog_models.cc
[modify] https://crrev.com/b51a5d3890ba8be0f78209b3a8f6f5c947d99527/chrome/browser/ui/autofill/autofill_dialog_models.h
[modify] https://crrev.com/b51a5d3890ba8be0f78209b3a8f6f5c947d99527/chrome/browser/ui/autofill/autofill_dialog_models_unittest.cc
[modify] https://crrev.com/b51a5d3890ba8be0f78209b3a8f6f5c947d99527/chrome/browser/ui/views/payments/credit_card_editor_view_controller.cc
[modify] https://crrev.com/b51a5d3890ba8be0f78209b3a8f6f5c947d99527/chrome/browser/ui/views/payments/credit_card_editor_view_controller_browsertest.cc
[delete] https://crrev.com/bde109ff2fbdf76f47021dce504e3cc57eb4a1b1/chrome/browser/ui/views/payments/credit_card_editor_view_controller_unittest.cc
[modify] https://crrev.com/b51a5d3890ba8be0f78209b3a8f6f5c947d99527/chrome/browser/ui/views/payments/cvc_unmask_view_controller.cc
[delete] https://crrev.com/bde109ff2fbdf76f47021dce504e3cc57eb4a1b1/chrome/browser/ui/views/payments/preselected_combobox_model.cc
[delete] https://crrev.com/bde109ff2fbdf76f47021dce504e3cc57eb4a1b1/chrome/browser/ui/views/payments/preselected_combobox_model.h
[modify] https://crrev.com/b51a5d3890ba8be0f78209b3a8f6f5c947d99527/chrome/test/BUILD.gn
[modify] https://crrev.com/b51a5d3890ba8be0f78209b3a8f6f5c947d99527/components/autofill/core/browser/credit_card.h
[modify] https://crrev.com/b51a5d3890ba8be0f78209b3a8f6f5c947d99527/components/autofill/core/browser/validation.cc
[modify] https://crrev.com/b51a5d3890ba8be0f78209b3a8f6f5c947d99527/components/payments/core/autofill_payment_instrument.cc
[modify] https://crrev.com/b51a5d3890ba8be0f78209b3a8f6f5c947d99527/components/payments/core/autofill_payment_instrument_unittest.cc

This should now be fixed.

Merge request for the patch in #c2

Your change meets the bar and is auto-approved for M60. Please go ahead and merge the CL to branch 3112 manually. Please contact milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), josafat@(ChromeOS), bustamante@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

Thanks for the fix. 

Please confirm whether the fix is verified in canary. If yes, merge to 3112 branch before 4.00 PM PST(05/31) to make it to next release.

This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/46753fc62b6bd42addf1146bf972c9cad073c2b2

commit 46753fc62b6bd42addf1146bf972c9cad073c2b2
Author: Mathieu Perreault <mathp@chromium.org>
Date: Fri Jun 02 15:21:17 2017

[Merge M60][Payments] Refactor the year and month combobox models and preselect.

Few changes:
* In CVC screen, will preselect the invalid expiration values.
* Using YearComboboxModel and MonthComboboxModel in credit card editor
* An expired card will not appear as such in the Payment Sheet and
  Payment method screens. User will have the option to fix the expiration
  at the CVC step.

Bug:  726394 
Test: unit_tests, browser_tests
Change-Id: I680e6d6978d60be6b1f6758e76e0d1b9c4b6b096
Reviewed-on: https://chromium-review.googlesource.com/516963
Commit-Queue: Mathieu Perreault <mathp@chromium.org>
Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Reviewed-by: Anthony Vallee-Dubois <anthonyvd@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#475105}
Review-Url: https://codereview.chromium.org/2918133002 .
Cr-Commit-Position: refs/branch-heads/3112@{#115}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

[modify] https://crrev.com/46753fc62b6bd42addf1146bf972c9cad073c2b2/chrome/browser/ui/BUILD.gn
[modify] https://crrev.com/46753fc62b6bd42addf1146bf972c9cad073c2b2/chrome/browser/ui/autofill/autofill_dialog_models.cc
[modify] https://crrev.com/46753fc62b6bd42addf1146bf972c9cad073c2b2/chrome/browser/ui/autofill/autofill_dialog_models.h
[modify] https://crrev.com/46753fc62b6bd42addf1146bf972c9cad073c2b2/chrome/browser/ui/autofill/autofill_dialog_models_unittest.cc
[modify] https://crrev.com/46753fc62b6bd42addf1146bf972c9cad073c2b2/chrome/browser/ui/views/payments/credit_card_editor_view_controller.cc
[modify] https://crrev.com/46753fc62b6bd42addf1146bf972c9cad073c2b2/chrome/browser/ui/views/payments/credit_card_editor_view_controller_browsertest.cc
[delete] https://crrev.com/9d49fb2845a1c579c67dd41132319e8f4eabbfac/chrome/browser/ui/views/payments/credit_card_editor_view_controller_unittest.cc
[modify] https://crrev.com/46753fc62b6bd42addf1146bf972c9cad073c2b2/chrome/browser/ui/views/payments/cvc_unmask_view_controller.cc
[delete] https://crrev.com/9d49fb2845a1c579c67dd41132319e8f4eabbfac/chrome/browser/ui/views/payments/preselected_combobox_model.cc
[delete] https://crrev.com/9d49fb2845a1c579c67dd41132319e8f4eabbfac/chrome/browser/ui/views/payments/preselected_combobox_model.h
[modify] https://crrev.com/46753fc62b6bd42addf1146bf972c9cad073c2b2/chrome/test/BUILD.gn
[modify] https://crrev.com/46753fc62b6bd42addf1146bf972c9cad073c2b2/components/autofill/core/browser/credit_card.h
[modify] https://crrev.com/46753fc62b6bd42addf1146bf972c9cad073c2b2/components/autofill/core/browser/validation.cc
[modify] https://crrev.com/46753fc62b6bd42addf1146bf972c9cad073c2b2/components/payments/core/autofill_payment_instrument.cc
[modify] https://crrev.com/46753fc62b6bd42addf1146bf972c9cad073c2b2/components/payments/core/autofill_payment_instrument_unittest.cc