Remove test-only constructor from CreditCard.

components/autofill/core/browser/autofill_external_delegate_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 <memory>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
+#include "base/guid.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/user_action_tester.h"
 #include "build/build_config.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
@@ skipping 594 matching lines @@
       base::string16(), POPUP_ITEM_ID_CREDIT_CARD_SIGNIN_PROMO, 0);
 }
 
 MATCHER_P(CreditCardMatches, card, "") {
   return !arg.Compare(card);
 }
 
 // Test that autofill manager will fill the credit card form after user scans a
 // credit card.
 TEST_F(AutofillExternalDelegateUnitTest, FillCreditCardForm) {
-  CreditCard card(base::ASCIIToUTF16("test"), 1, 3000);
+  CreditCard card(base::GenerateGUID(), std::string());

[Evan Stade, 2016/08/18 00:48:55]

I'd suggest adding something to autofill_test_utils to streamline this

[please use gerrit instead, 2016/08/19 23:05:49]

There's already autofill::test::SetCreditCardInfo(), so I'm using that.

   card.SetRawInfo(CREDIT_CARD_NAME_FULL, base::ASCIIToUTF16("Alice"));
+  card.SetNumber(base::ASCIIToUTF16("4111"));
+  card.SetExpirationMonth(1);
+  card.SetExpirationYear(3000);
   EXPECT_CALL(*autofill_manager_,
       FillCreditCardForm(_, _, _, CreditCardMatches(card), base::string16()));
   external_delegate_->OnCreditCardScanned(card);
 }
 
 TEST_F(AutofillExternalDelegateUnitTest, IgnoreAutocompleteOffForAutofill) {
   const FormData form;
   FormFieldData field;
   field.is_focusable = true;
   field.should_autocomplete = false;
@@ skipping 18 matching lines @@
               RendererShouldFillFieldWithValue(dummy_string));
   base::HistogramTester histogram_tester;
   external_delegate_->DidAcceptSuggestion(dummy_string,
                                           POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY,
                                           0);
   histogram_tester.ExpectUniqueSample(
       "Autofill.SuggestionAcceptedIndex.Autocomplete", 0, 1);
 }
 
 }  // namespace autofill