Merge 54410 - [Mac] Un-tweak omnibox height and spacing and font....

chrome/browser/autocomplete/autocomplete_edit_view_mac.mm

 // Copyright (c) 2010 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/autocomplete/autocomplete_edit_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
@@ skipping 902 matching lines @@
       return UTF8ToWide(url.spec());
     }
   }
 
   return std::wstring();
 }
 
 // static
 NSFont* AutocompleteEditViewMac::GetFieldFont() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  return rb.GetFont(ResourceBundle::BaseFont).DeriveFont(1).nativeFont();
+  return rb.GetFont(ResourceBundle::BaseFont).nativeFont();
 }