[Payments] Have expiration date be on the same line in CC editor

chrome/browser/ui/views/payments/payment_request_browsertest_base.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/payment_request_browsertest_base.h"
 
 #include <algorithm>
 #include <iostream>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/views/payments/editor_view_controller.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/browser/ui/views/payments/view_stack.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/autofill/core/browser/address_combobox_model.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/payments/content/payment_request.h"
@@ skipping 508 matching lines @@
 void PaymentRequestBrowserTestBase::PayWithCreditCardAndWait(
     const base::string16& cvc) {
   OpenCVCPromptWithCVC(cvc);
 
   ResetEventObserver(DialogEvent::DIALOG_CLOSED);
   ClickOnDialogViewAndWait(DialogViewID::CVC_PROMPT_CONFIRM_BUTTON);
 }
 
 base::string16 PaymentRequestBrowserTestBase::GetEditorTextfieldValue(
     autofill::ServerFieldType type) {
-  ValidatingTextfield* textfield = static_cast<ValidatingTextfield*>(
-      delegate_->dialog_view()->GetViewByID(static_cast<int>(type)));
+  ValidatingTextfield* textfield =
+      static_cast<ValidatingTextfield*>(delegate_->dialog_view()->GetViewByID(
+          EditorViewController::GetInputFieldViewId(type)));
   DCHECK(textfield);
   return textfield->text();
 }
 
 void PaymentRequestBrowserTestBase::SetEditorTextfieldValue(
     const base::string16& value,
     autofill::ServerFieldType type) {
-  ValidatingTextfield* textfield = static_cast<ValidatingTextfield*>(
-      delegate_->dialog_view()->GetViewByID(static_cast<int>(type)));
+  ValidatingTextfield* textfield =
+      static_cast<ValidatingTextfield*>(delegate_->dialog_view()->GetViewByID(
+          EditorViewController::GetInputFieldViewId(type)));
   DCHECK(textfield);
   textfield->SetText(value);
   textfield->OnContentsChanged();
   textfield->OnBlur();
 }
 
 base::string16 PaymentRequestBrowserTestBase::GetComboboxValue(
     autofill::ServerFieldType type) {
-  ValidatingCombobox* combobox = static_cast<ValidatingCombobox*>(
-      delegate_->dialog_view()->GetViewByID(static_cast<int>(type)));
+  ValidatingCombobox* combobox =
+      static_cast<ValidatingCombobox*>(delegate_->dialog_view()->GetViewByID(
+          EditorViewController::GetInputFieldViewId(type)));
   DCHECK(combobox);
   return combobox->model()->GetItemAt(combobox->selected_index());
 }
 
 void PaymentRequestBrowserTestBase::SetComboboxValue(
     const base::string16& value,
     autofill::ServerFieldType type) {
-  ValidatingCombobox* combobox = static_cast<ValidatingCombobox*>(
-      delegate_->dialog_view()->GetViewByID(static_cast<int>(type)));
+  ValidatingCombobox* combobox =
+      static_cast<ValidatingCombobox*>(delegate_->dialog_view()->GetViewByID(
+          EditorViewController::GetInputFieldViewId(type)));
   DCHECK(combobox);
   combobox->SelectValue(value);
   combobox->OnContentsChanged();
   combobox->OnBlur();
 }
 
 void PaymentRequestBrowserTestBase::SelectBillingAddress(
     const std::string& billing_address_id) {
   views::Combobox* address_combobox(static_cast<views::Combobox*>(
       dialog_view()->GetViewByID(static_cast<int>(kBillingAddressType))));
@@ skipping 167 matching lines @@
       break;
     case DialogEvent::NOT_SUPPORTED_ERROR:
       out << "NOT_SUPPORTED_ERROR";
       break;
     case DialogEvent::ABORT_CALLED:
       out << "ABORT_CALLED";
       break;
   }
   return out;
 }