[Autofill] Update credit card icons to match payments.

chrome/browser/ui/autofill/autofill_popup_layout_model.cc

 // Copyright (c) 2016 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 "chrome/browser/ui/autofill/autofill_popup_layout_model.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 254 matching lines @@
 int AutofillPopupLayoutModel::GetIconResourceID(
     const base::string16& resource_name) const {
   int result = -1;
   for (size_t i = 0; i < arraysize(kDataResources); ++i) {
     if (resource_name == base::ASCIIToUTF16(kDataResources[i].name)) {
       result = kDataResources[i].id;
       break;
     }
   }
 
-#if defined(OS_ANDROID) && !defined(USE_AURA)
-  if (result == IDR_AUTOFILL_CC_SCAN_NEW && IsKeyboardAccessoryEnabled())
-    result = IDR_AUTOFILL_CC_SCAN_NEW_KEYBOARD_ACCESSORY;
-#endif
-
   return result;
 }
 
 const gfx::Rect AutofillPopupLayoutModel::RoundedElementBounds() const {
   return gfx::ToEnclosingRect(delegate_->element_bounds());
 }
 
 bool AutofillPopupLayoutModel::IsPopupLayoutExperimentEnabled() const {
   return is_credit_card_popup_ &&
       IsAutofillCreditCardPopupLayoutExperimentEnabled();
@@ skipping 12 matching lines @@
 unsigned int AutofillPopupLayoutModel::GetDropdownItemHeight() const {
   return GetPopupDropdownItemHeight();
 }
 
 bool AutofillPopupLayoutModel::IsIconAtStart(int frontend_id) const {
   return frontend_id == POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE ||
       (is_credit_card_popup_ && IsIconInCreditCardPopupAtStart());
 }
 
 }  // namespace autofill