[Merge] Use regular weight for password autofill popup on password field.

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 152 matching lines @@
   // All other message types are defined here.
   PopupItemId id = static_cast<PopupItemId>(suggestions[index].frontend_id);
   switch (id) {
     case POPUP_ITEM_ID_INSECURE_CONTEXT_PAYMENT_DISABLED_MESSAGE:
     case POPUP_ITEM_ID_CLEAR_FORM:
     case POPUP_ITEM_ID_CREDIT_CARD_SIGNIN_PROMO:
     case POPUP_ITEM_ID_AUTOFILL_OPTIONS:
     case POPUP_ITEM_ID_SCAN_CREDIT_CARD:
     case POPUP_ITEM_ID_SEPARATOR:
     case POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE:
+    case POPUP_ITEM_ID_TITLE:
+    case POPUP_ITEM_ID_PASSWORD_ENTRY:
       return normal_font_list_;
-    case POPUP_ITEM_ID_TITLE:
     case POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY:
     case POPUP_ITEM_ID_DATALIST_ENTRY:
-    case POPUP_ITEM_ID_PASSWORD_ENTRY:
+    case POPUP_ITEM_ID_USERNAME_ENTRY:
       return bold_font_list_;
   }
   NOTREACHED();
   return normal_font_list_;
 }
 
 const gfx::FontList& AutofillPopupLayoutModel::GetLabelFontListForRow(
     size_t index) const {
   std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
   if (suggestions[index].frontend_id ==
@@ skipping 107 matching lines @@
 bool AutofillPopupLayoutModel::IsIconAtStart(int frontend_id) const {
   return frontend_id == POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE ||
       (is_credit_card_popup_ && IsIconInCreditCardPopupAtStart());
 }
 
 unsigned int AutofillPopupLayoutModel::GetMargin() const {
   return GetPopupMargin();
 }
 
 }  // namespace autofill