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

chrome/browser/ui/views/payments/shipping_address_editor_view_controller_browsertest.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 <algorithm>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ui/views/payments/editor_view_controller.h"
 #include "chrome/browser/ui/views/payments/payment_request_browsertest_base.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
 #include "chrome/browser/ui/views/payments/validating_textfield.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/country_combobox_model.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/region_combobox_model.h"
 #include "components/autofill/core/browser/test_region_data_loader.h"
 #include "components/payments/content/payment_request_spec.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 64 matching lines @@
     SetFieldTestValue(autofill::ADDRESS_HOME_STREET_ADDRESS);
     SetFieldTestValue(autofill::ADDRESS_HOME_CITY);
     SetFieldTestValue(autofill::ADDRESS_HOME_ZIP);
     SetFieldTestValue(autofill::PHONE_HOME_WHOLE_NUMBER);
   }
 
   // First check if the requested field of |type| exists, if so, set its value
   // in |textfield_text| if it's not null, and return true.
   bool GetEditorTextfieldValueIfExists(autofill::ServerFieldType type,
                                        base::string16* textfield_text) {
-    ValidatingTextfield* textfield = static_cast<ValidatingTextfield*>(
-        dialog_view()->GetViewByID(static_cast<int>(type)));
+    ValidatingTextfield* textfield =
+        static_cast<ValidatingTextfield*>(dialog_view()->GetViewByID(
+            EditorViewController::GetInputFieldViewId(type)));
     if (!textfield)
       return false;
     if (textfield_text)
       *textfield_text = textfield->text();
     return true;
   }
 
   // |unset_types| can be null, but when it's not, the fields that are not set
   // get their type added to it, so that the caller can tell which types are not
   // set for a given country. |accept_empty_phone_number| can be set to true to
@@ skipping 40 matching lines @@
           unset_types->insert(autofill::PHONE_HOME_WHOLE_NUMBER);
       } else if (textfield_text != base::ASCIIToUTF16(kHomePhone)) {
         EXPECT_EQ(base::ASCIIToUTF16(kFormattedHomePhone), textfield_text);
       }
     } else if (unset_types) {
       unset_types->insert(autofill::PHONE_HOME_WHOLE_NUMBER);
     }
   }
 
   std::string GetSelectedCountryCode() {
-    views::Combobox* country_combobox =
-        static_cast<views::Combobox*>(dialog_view()->GetViewByID(
-            static_cast<int>(autofill::ADDRESS_HOME_COUNTRY)));
+    views::Combobox* country_combobox = static_cast<views::Combobox*>(
+        dialog_view()->GetViewByID(EditorViewController::GetInputFieldViewId(
+            autofill::ADDRESS_HOME_COUNTRY)));
     DCHECK(country_combobox);
     int selected_country_row = country_combobox->GetSelectedRow();
     autofill::CountryComboboxModel* country_model =
         static_cast<autofill::CountryComboboxModel*>(country_combobox->model());
 
     return country_model->countries()[selected_country_row]->country_code();
   }
 
   PersonalDataLoadedObserverMock personal_data_observer_;
   autofill::TestRegionDataLoader test_region_data_loader_;
@@ skipping 141 matching lines @@
   SetRegionDataLoader(&test_region_data_loader_);
 
   test_region_data_loader_.set_synchronous_callback(false);
   OpenShippingAddressEditorScreen();
   std::vector<std::pair<std::string, std::string>> regions1;
   regions1.push_back(std::make_pair("1a", "region1a"));
   test_region_data_loader_.SendAsynchronousData(regions1);
 
   SetCommonFields();
 
-  views::Combobox* country_combobox =
-      static_cast<views::Combobox*>(dialog_view()->GetViewByID(
-          static_cast<int>(autofill::ADDRESS_HOME_COUNTRY)));
+  views::Combobox* country_combobox = static_cast<views::Combobox*>(
+      dialog_view()->GetViewByID(EditorViewController::GetInputFieldViewId(
+          autofill::ADDRESS_HOME_COUNTRY)));
   ASSERT_NE(nullptr, country_combobox);
   ASSERT_EQ(0, country_combobox->GetSelectedRow());
   autofill::CountryComboboxModel* country_model =
       static_cast<autofill::CountryComboboxModel*>(country_combobox->model());
   size_t num_countries = country_model->countries().size();
   ASSERT_GT(num_countries, 10UL);
 
   bool use_regions1 = true;
   std::vector<std::pair<std::string, std::string>> regions2;
   regions2.push_back(std::make_pair("2a", "region2a"));
   regions2.push_back(std::make_pair("2b", "region2b"));
   std::set<autofill::ServerFieldType> unset_types;
   for (size_t country_index = 10; country_index < num_countries;
        country_index += num_countries / 10) {
     // The editor updates asynchronously when the country changes.
     ResetEventObserver(DialogEvent::EDITOR_VIEW_UPDATED);
 
-    views::Combobox* region_combobox =
-        static_cast<views::Combobox*>(dialog_view()->GetViewByID(
-            static_cast<int>(autofill::ADDRESS_HOME_STATE)));
+    views::Combobox* region_combobox = static_cast<views::Combobox*>(
+        dialog_view()->GetViewByID(EditorViewController::GetInputFieldViewId(
+            autofill::ADDRESS_HOME_STATE)));
     autofill::RegionComboboxModel* region_model = nullptr;
     // Some countries don't have a state combobox.
     if (region_combobox) {
       autofill::RegionComboboxModel* region_model =
           static_cast<autofill::RegionComboboxModel*>(region_combobox->model());
       if (use_regions1) {
         ASSERT_EQ(1, region_model->GetItemCount());
         EXPECT_EQ(base::ASCIIToUTF16("region1a"), region_model->GetItemAt(0));
       } else {
         ASSERT_EQ(2, region_model->GetItemCount());
@@ skipping 10 matching lines @@
     country_combobox = nullptr;
     country_model = nullptr;
     region_combobox = nullptr;
     region_model = nullptr;
     WaitForObservedEvent();
 
     // Some types could have been lost in previous countries and may now
     // available in this country.
     std::set<autofill::ServerFieldType> set_types;
     for (auto type : unset_types) {
-      ValidatingTextfield* textfield = static_cast<ValidatingTextfield*>(
-          dialog_view()->GetViewByID(static_cast<int>(type)));
+      ValidatingTextfield* textfield =
+          static_cast<ValidatingTextfield*>(dialog_view()->GetViewByID(
+              EditorViewController::GetInputFieldViewId(type)));
       if (textfield) {
         EXPECT_TRUE(textfield->text().empty()) << type;
         SetFieldTestValue(type);
         set_types.insert(type);
       }
     }
     for (auto type : set_types) {
       unset_types.erase(type);
     }
 
     // Make sure the country combobox was properly reset to the chosen country.
-    country_combobox = static_cast<views::Combobox*>(dialog_view()->GetViewByID(
-        static_cast<int>(autofill::ADDRESS_HOME_COUNTRY)));
+    country_combobox = static_cast<views::Combobox*>(
+        dialog_view()->GetViewByID(EditorViewController::GetInputFieldViewId(
+            autofill::ADDRESS_HOME_COUNTRY)));
     DCHECK(country_combobox);
     EXPECT_EQ(country_index,
               static_cast<size_t>(country_combobox->GetSelectedRow()));
     country_model =
         static_cast<autofill::CountryComboboxModel*>(country_combobox->model());
     ASSERT_EQ(num_countries, country_model->countries().size());
 
     // Update regions.
     test_region_data_loader_.SendAsynchronousData(use_regions1 ? regions1
                                                                : regions2);
@@ skipping 154 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(PaymentRequestShippingAddressEditorTest,
                        FocusFirstInvalidField_Name) {
   InvokePaymentRequestUI();
   SetRegionDataLoader(&test_region_data_loader_);
 
   test_region_data_loader_.set_synchronous_callback(true);
   OpenShippingAddressEditorScreen();
 
   // We know that the name field is always the first one in a shipping address.
-  views::Textfield* textfield = static_cast<views::Textfield*>(
-      dialog_view()->GetViewByID(static_cast<int>(autofill::NAME_FULL)));
+  views::Textfield* textfield =
+      static_cast<views::Textfield*>(dialog_view()->GetViewByID(
+          EditorViewController::GetInputFieldViewId(autofill::NAME_FULL)));
   DCHECK(textfield);
   EXPECT_TRUE(textfield->text().empty());
   EXPECT_TRUE(textfield->invalid());
   EXPECT_TRUE(textfield->HasFocus());
 }
 
 IN_PROC_BROWSER_TEST_F(PaymentRequestShippingAddressEditorTest,
                        FocusFirstInvalidField_NotName) {
   // Add address with the name set, so that another view takes focus.
   autofill::AutofillProfile profile;
   profile.SetInfo(autofill::AutofillType(autofill::NAME_FULL),
                   base::ASCIIToUTF16(kNameFull), "fr_CA");
   AddAutofillProfile(profile);
 
   InvokePaymentRequestUI();
   SetRegionDataLoader(&test_region_data_loader_);
   test_region_data_loader_.set_synchronous_callback(true);
   OpenShippingAddressSectionScreen();
   ResetEventObserver(DialogEvent::SHIPPING_ADDRESS_EDITOR_OPENED);
   ClickOnChildInListViewAndWait(/*child_index=*/0, /*num_children=*/1,
                                 DialogViewID::SHIPPING_ADDRESS_SHEET_LIST_VIEW);
 
-  views::Textfield* textfield = static_cast<views::Textfield*>(
-      dialog_view()->GetViewByID(static_cast<int>(autofill::NAME_FULL)));
+  views::Textfield* textfield =
+      static_cast<views::Textfield*>(dialog_view()->GetViewByID(
+          EditorViewController::GetInputFieldViewId(autofill::NAME_FULL)));
   DCHECK(textfield);
   EXPECT_FALSE(textfield->text().empty());
   EXPECT_FALSE(textfield->invalid());
   EXPECT_FALSE(textfield->HasFocus());
 
   // Since we can't easily tell which field is after name, let's just make sure
   // that a view has focus. Unfortunately, we can't cast it to a specific type
   // that we could query for validity (it could be either text or combobox).
   EXPECT_NE(textfield->GetFocusManager()->GetFocusedView(), nullptr);
 }
 
 }  // namespace payments