Add upstream bits necessary for iOS card unmask prompt.

components/autofill/core/browser/autofill_metrics_unittest.cc

 // Copyright 2013 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 "components/autofill/core/browser/autofill_metrics.h"
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
@@ skipping 1281 matching lines @@
   test::CreateTestFormField("Month", "card_month", "", "text", &field);
   form.fields.push_back(field);
   field_types.push_back(CREDIT_CARD_EXP_MONTH);
   test::CreateTestFormField("Year", "card_year", "", "text", &field);
   form.fields.push_back(field);
   field_types.push_back(CREDIT_CARD_EXP_2_DIGIT_YEAR);
   test::CreateTestFormField("Credit card", "card", "", "text", &field);
   form.fields.push_back(field);
   field_types.push_back(CREDIT_CARD_NUMBER);
 
+  // On iOS, the credit card field will only be filled out if that's the one
+  // selected, since we only fill out one field at a time. On other platforms,
+  // it doesn't matter which field is selected.
+  FormFieldData selected_field;

[Evan Stade, 2015/05/14 22:41:38]

why not just makes this form.fields[2] for all platforms

[Justin Donnelly, 2015/05/14 22:43:45]

I figured it would be better to continue to test the common case on the other
platforms, where the first form field is selected and that fills out the whole
form. But I don't feel strongly about it if you prefer it the other way.

[Evan Stade, 2015/05/14 22:45:34]

that's not really what this test is testing. The other test you updated tests
that.

[Justin Donnelly, 2015/05/15 19:26:58]

Understood that we're testing the logging here. I guess part of my motivation
was to avoid using the magic index 2. We're using it on iOS anyway, but this way
it's documented clearly why. But I could see this setup making it seem like we
care which field is selected on non-iOS which is misleading.

Like I said, no big deal. Removed.

+#if defined(OS_IOS)
+  selected_field = form.fields[2];  // credit card field
+#else
+  selected_field = form.fields[0];
+#endif  // defined(OS_IOS)
+
   // Simulate having seen this form on page load.
   // |form_structure| will be owned by |autofill_manager_|.
   autofill_manager_->AddSeenForm(form, field_types, field_types);
 
   {
     // Simulating selecting a masked card server suggestion.
     base::HistogramTester histogram_tester;
     SuggestionBackendID guid(
         "10000000-0000-0000-0000-000000000002", 0); // masked server card
     autofill_manager_->FillOrPreviewForm(
         AutofillDriver::FORM_DATA_ACTION_FILL,
-        0, form, form.fields.front(),
+        0, form, selected_field,
         autofill_manager_->MakeFrontendID(guid, SuggestionBackendID()));
     histogram_tester.ExpectBucketCount(
         "Autofill.FormEvents.CreditCard",
         AutofillMetrics::FORM_EVENT_MASKED_SERVER_CARD_SUGGESTION_SELECTED, 1);
     histogram_tester.ExpectBucketCount(
         "Autofill.FormEvents.CreditCard",
         AutofillMetrics::FORM_EVENT_MASKED_SERVER_CARD_SUGGESTION_SELECTED_ONCE,
         1);
   }
 
   // Reset the autofill manager state.
   autofill_manager_->Reset();
   autofill_manager_->AddSeenForm(form, field_types, field_types);
 
   {
     // Simulating selecting multiple times a masked card server.
     base::HistogramTester histogram_tester;
     SuggestionBackendID guid(
         "10000000-0000-0000-0000-000000000002", 0); // masked server card
     autofill_manager_->FillOrPreviewForm(
         AutofillDriver::FORM_DATA_ACTION_FILL,
-        0, form, form.fields.front(),
+        0, form, selected_field,
         autofill_manager_->MakeFrontendID(guid, SuggestionBackendID()));
     autofill_manager_->FillOrPreviewForm(
         AutofillDriver::FORM_DATA_ACTION_FILL,
-        0, form, form.fields.front(),
+        0, form, selected_field,
         autofill_manager_->MakeFrontendID(guid, SuggestionBackendID()));
     histogram_tester.ExpectBucketCount(
         "Autofill.FormEvents.CreditCard",
         AutofillMetrics::FORM_EVENT_MASKED_SERVER_CARD_SUGGESTION_SELECTED, 2);
     histogram_tester.ExpectBucketCount(
         "Autofill.FormEvents.CreditCard",
         AutofillMetrics::FORM_EVENT_MASKED_SERVER_CARD_SUGGESTION_SELECTED_ONCE,
         1);
   }
 }
@@ skipping 1690 matching lines @@
     histogram_tester.ExpectTotalCount(
         "Autofill.FillDuration.FromInteraction.WithAutofill", 0);
     histogram_tester.ExpectTotalCount(
         "Autofill.FillDuration.FromInteraction.WithoutAutofill", 0);
 
     autofill_manager_->Reset();
   }
 }
 
 }  // namespace autofill