Replace hard-coded colors from ui::NativeTheme for consistency and accessibility.

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 173 matching lines @@
 const gfx::FontList& AutofillPopupLayoutModel::GetLabelFontListForRow(
     size_t index) const {
   std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
   if (suggestions[index].frontend_id ==
       POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE)
     return normal_font_list_;
 
   return smaller_font_list_;
 }
 
-SkColor AutofillPopupLayoutModel::GetValueFontColorForRow(size_t index) const {
+ui::NativeTheme::ColorId AutofillPopupLayoutModel::GetValueFontColorIDForRow(
+    size_t index) const {
   std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
   switch (suggestions[index].frontend_id) {
     case POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE:
-      return gfx::kGoogleRed700;
+      return ui::NativeTheme::kColorId_AlertSeverityHigh;
     case POPUP_ITEM_ID_INSECURE_CONTEXT_PAYMENT_DISABLED_MESSAGE:
-      return kLabelTextColor;
+      return ui::NativeTheme::kColorId_ResultsTableNormalDimmedText;
     default:
-      return kValueTextColor;
+      return ui::NativeTheme::kColorId_ResultsTableNormalText;
   }
 }
 
 gfx::ImageSkia AutofillPopupLayoutModel::GetIconImage(size_t index) const {
   std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
   const base::string16& icon_str = suggestions[index].icon;
 
   // For http warning message, get icon images from VectorIconId, which is the
   // same as security indicator icons in location bar.
   if (suggestions[index].frontend_id ==
@@ skipping 77 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