Align the Mac Omnibox items vertically again

chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

 // Copyright (c) 2012 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/cocoa/omnibox/omnibox_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "base/mac/foundation_util.h"
 #include "base/memory/ptr_util.h"
@@ skipping 1100 matching lines @@
 // static
 NSFont* OmniboxViewMac::GetNormalFieldFont() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb
       .GetFontWithDelta(kOmniboxNormalFontSizeDelta, gfx::Font::NORMAL,
                         gfx::Font::Weight::NORMAL)
       .GetNativeFont();
 }
 
 NSFont* OmniboxViewMac::GetBoldFieldFont() {
+  // Request a bold font, then make it larger. ResourceBundle will do the
+  // opposite which makes a large system normal font a non-system bold font.
+  // That gives a different baseline to making the non-system bold font larger.
+  // And while the omnibox locks the baseline in ApplyTextStyle(),
+  // OmniboxPopupCellData does not.
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb
-      .GetFontWithDelta(kOmniboxNormalFontSizeDelta, gfx::Font::NORMAL,
-                        gfx::Font::Weight::BOLD)
+      .GetFontWithDelta(0, gfx::Font::NORMAL, gfx::Font::Weight::BOLD)
+      .Derive(kOmniboxNormalFontSizeDelta, gfx::Font::NORMAL,
+              gfx::Font::Weight::BOLD)
       .GetNativeFont();
 }
 
 NSFont* OmniboxViewMac::GetLargeFont() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb
       .GetFontWithDelta(kOmniboxLargeFontSizeDelta, gfx::Font::NORMAL,
                         gfx::Font::Weight::NORMAL)
       .GetNativeFont();
 }
@@ skipping 34 matching lines @@
                               display_text);
   NSDictionary* notification_info = @{
       NSAccessibilityAnnouncementKey : announcement,
       NSAccessibilityPriorityKey :     @(NSAccessibilityPriorityHigh)
   };
   NSAccessibilityPostNotificationWithUserInfo(
       [field_ window],
       NSAccessibilityAnnouncementRequestedNotification,
       notification_info);
 }