Autofill Credit Card resources.

components/autofill/core/browser/credit_card_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 "base/basictypes.h"
 #include "base/guid.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/form_field_data.h"
+#include "grit/component_scaled_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-// TODO(blundell): Eliminate the need for this conditional include.
-// crbug.com/328150
-#if !defined(OS_IOS)
-#include "grit/webkit_resources.h"
-#endif
-
 using base::ASCIIToUTF16;
 
 namespace autofill {
 namespace {
 
 // From https://www.paypalobjects.com/en_US/vhelp/paypalmanager_help/credit_card_numbers.htm
 const char* const kValidNumbers[] = {
   "378282246310005",
   "3714 4963 5398 431",
   "3787-3449-3671-000",
@@ skipping 130 matching lines @@
   b.set_origin("banana");
   EXPECT_EQ(0, a.Compare(b));
 
   // Different values produce non-zero results.
   test::SetCreditCardInfo(&a, "Jimmy", NULL, NULL, NULL);
   test::SetCreditCardInfo(&b, "Ringo", NULL, NULL, NULL);
   EXPECT_GT(0, a.Compare(b));
   EXPECT_LT(0, b.Compare(a));
 }
 
-// TODO(blundell): Either move these resources out of webkit_resources or
-// this test into //components/autofill/content/browser to eliminate the
-// need for this ifdef-ing. crbug.com/328150
-#if !defined(OS_IOS)
 // Test we get the correct icon for each card type.
 TEST(CreditCardTest, IconResourceId) {
   EXPECT_EQ(IDR_AUTOFILL_CC_AMEX,
             CreditCard::IconResourceId(kAmericanExpressCard));
   EXPECT_EQ(IDR_AUTOFILL_CC_DINERS,
             CreditCard::IconResourceId(kDinersCard));
   EXPECT_EQ(IDR_AUTOFILL_CC_DISCOVER,
             CreditCard::IconResourceId(kDiscoverCard));
   EXPECT_EQ(IDR_AUTOFILL_CC_JCB,
             CreditCard::IconResourceId(kJCBCard));
   EXPECT_EQ(IDR_AUTOFILL_CC_MASTERCARD,
             CreditCard::IconResourceId(kMasterCard));
   EXPECT_EQ(IDR_AUTOFILL_CC_VISA,
             CreditCard::IconResourceId(kVisaCard));
 }
-#endif  // !defined(OS_IOS)
 
 TEST(CreditCardTest, UpdateFromImportedCard) {
   CreditCard original_card(base::GenerateGUID(), "https://www.example.com");
   test::SetCreditCardInfo(
       &original_card, "John Dillinger", "123456789012", "09", "2017");
 
   CreditCard a = original_card;
 
   // The new card has a different name, expiration date, and origin.
   CreditCard b = a;
@@ skipping 329 matching lines @@
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
     base::string16 card_number = ASCIIToUTF16(test_cases[i].card_number);
     SCOPED_TRACE(card_number);
     EXPECT_EQ(test_cases[i].type, CreditCard::GetCreditCardType(card_number));
     EXPECT_EQ(test_cases[i].is_valid, IsValidCreditCardNumber(card_number));
   }
 }
 
 }  // namespace autofill