Some more pre-material cleanups

chrome/browser/ui/cocoa/infobars/infobar_controller.mm

Index: chrome/browser/ui/cocoa/infobars/infobar_controller.mm
diff --git a/chrome/browser/ui/cocoa/infobars/infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/infobar_controller.mm
index 2d14656cb35356c96af0f55a31891770862cdbb3..14e753a4639ab8fba0e6def91325d8edeeff23a8 100644
--- a/chrome/browser/ui/cocoa/infobars/infobar_controller.mm
+++ b/chrome/browser/ui/cocoa/infobars/infobar_controller.mm
@@ -75,8 +75,8 @@
 
   // Infobars are drawn a little taller, so have to move its controls to keep
   // them centered.
-  CGFloat heightDelta = InfoBarContainerDelegate::kDefaultBarTargetHeightMd -
-                        InfoBarContainerDelegate::kDefaultBarTargetHeight;
+  // TODO(ellyjones): Remove this constant.

[Peter Kasting, 2016/10/24 23:49:56]

Remove how?

[Evan Stade, 2016/10/25 16:22:56]

I don't know exactly how (not familiar enough with cocoa), but I imagine it
involves updated the .xib? Or perhaps using [self frame].origin.y and [subview
frame].origin.y? This is just causing things to be vertically centered, it
doesn't seem like that should require two constants.

+  CGFloat heightDelta = 2;
   for (NSView* nextSubview in [infoBarView_ subviews]) {
     NSRect frame = [nextSubview frame];
     frame.origin.y += heightDelta / 2;