Revert "Increase omnibox size by 2 px. Increase nominal font size in omnibox to 16 px."

chrome/browser/ui/views/location_bar/location_bar_view.h

Index: chrome/browser/ui/views/location_bar/location_bar_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index 2b28b5d68d43df7b3bb1619f6cebc13637f1845d..9c8be0e78d7ac90baa747c46f93c3bf89ff352cf 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -324,10 +324,12 @@ class LocationBarView : public LocationBar,
   // edges.
   static int GetItemPadding();
 
-  // Thickness of the edges of the omnibox background images, in normal mode.
-  static const int kNormalEdgeThickness;
+  // Thickness of the left and right edges of the omnibox, in normal mode.
+  static const int kNormalHorizontalEdgeThickness;
   // The same, but for popup mode.
   static const int kPopupEdgeThickness;
+  // Thickness of the top and bottom edges of the omnibox.
+  static const int kNormalVerticalEdgeThickness;
   // Amount of padding built into the standard omnibox icons.
   static const int kIconInternalPadding;
   // Space between the edge and a bubble.
@@ -348,7 +350,7 @@ class LocationBarView : public LocationBar,
 
   // The same, but for the top and bottom edges.
   int vertical_edge_thickness() const {
-    return is_popup_mode_ ? kPopupEdgeThickness : kNormalEdgeThickness;
+    return is_popup_mode_ ? kPopupEdgeThickness : kNormalVerticalEdgeThickness;
   }
 
   // Update the visibility state of the Content Blocked icons to reflect what is
@@ -421,8 +423,7 @@ class LocationBarView : public LocationBar,
   content::PageTransition transition_;
 
   // An object used to paint the normal-mode background.
-  scoped_ptr<views::Painter> background_border_painter_;
-  scoped_ptr<views::Painter> background_filling_painter_;
+  scoped_ptr<views::Painter> background_painter_;
 
   // An icon to the left of the edit field.
   LocationIconView* location_icon_view_;