Remove test-only constructor from CreditCard.

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 <stddef.h>
 
 #include <memory>
 #include <vector>
@@ skipping 137 matching lines @@
   }
 
   // Removes all existing credit cards and creates 0 or 1 local profiles and
   // 0 or 1 server profile according to the paramters.
   void RecreateCreditCards(bool include_local_credit_card,
                            bool include_masked_server_credit_card,
                            bool include_full_server_credit_card) {
     local_credit_cards_.clear();
     server_credit_cards_.clear();
     if (include_local_credit_card) {
-      CreditCard* credit_card =
-          new CreditCard(base::ASCIIToUTF16("4111111111111111"), 12, 24);
-      credit_card->set_guid("10000000-0000-0000-0000-000000000001");
-      local_credit_cards_.push_back(credit_card);
+      std::unique_ptr<CreditCard> credit_card(new CreditCard(
+          "10000000-0000-0000-0000-000000000001", std::string()));
+      test::SetCreditCardInfo(credit_card.get(), nullptr, "4111111111111111",
+                              "12", "24");
+      local_credit_cards_.push_back(credit_card.release());
     }
     if (include_masked_server_credit_card) {
-      CreditCard* credit_card = new CreditCard(
-          CreditCard::MASKED_SERVER_CARD, "server_id");
+      std::unique_ptr<CreditCard> credit_card(new CreditCard(
+          CreditCard::MASKED_SERVER_CARD, "server_id"));
       credit_card->set_guid("10000000-0000-0000-0000-000000000002");
       credit_card->SetTypeForMaskedCard(kDiscoverCard);
-      server_credit_cards_.push_back(credit_card);
+      server_credit_cards_.push_back(credit_card.release());
     }
     if (include_full_server_credit_card) {
-      CreditCard* credit_card = new CreditCard(
-          CreditCard::FULL_SERVER_CARD, "server_id");
+      std::unique_ptr<CreditCard> credit_card(new CreditCard(
+          CreditCard::FULL_SERVER_CARD, "server_id"));
       credit_card->set_guid("10000000-0000-0000-0000-000000000003");
-      server_credit_cards_.push_back(credit_card);
+      server_credit_cards_.push_back(credit_card.release());
     }
     Refresh();
   }
 
   bool IsAutofillEnabled() const override { return autofill_enabled_; }
 
  private:
   void CreateTestAutofillProfiles(ScopedVector<AutofillProfile>* profiles) {
     AutofillProfile* profile = new AutofillProfile;
     test::SetProfileInfo(profile, "Elvis", "Aaron",
@@ skipping 3883 matching lines @@
   EXPECT_THAT(
       histogram_tester.GetAllSamples("Autofill.ServerResponseHasDataForForm"),
       ElementsAre(Bucket(true, 2)));
 
   // No RAPPOR metrics are logged in the case there is at least some server data
   // available for all forms.
   EXPECT_EQ(0, rappor_service_.GetReportsCount());
 }
 
 }  // namespace autofill