Revert of Some more pre-material cleanups

chrome/browser/ui/cocoa/infobars/infobar_controller.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.
 
 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #import "chrome/browser/ui/cocoa/animatable_view.h"
@@ skipping 57 matching lines @@
     [image_ removeFromSuperview];
     image_ = nil;
     [labelPlaceholder_ setFrame:labelFrame];
   }
   [self initializeLabel];
 
   [self addAdditionalControls];
 
   // Infobars are drawn a little taller, so have to move its controls to keep
   // them centered.
-  // TODO(ellyjones): Remove this constant.
-  CGFloat heightDelta = 2;
+  CGFloat heightDelta = InfoBarContainerDelegate::kDefaultBarTargetHeightMd -
+                        InfoBarContainerDelegate::kDefaultBarTargetHeight;
   for (NSView* nextSubview in [infoBarView_ subviews]) {
     NSRect frame = [nextSubview frame];
     frame.origin.y += heightDelta / 2;
     [nextSubview setFrame:frame];
   }
 
   [infoBarView_ setInfobarType:[self delegate]->GetInfoBarType()];
   [infoBarView_ setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
 }
 
@@ skipping 103 matching lines @@
   [newLabel setAutoresizingMask:[labelPlaceholder_ autoresizingMask]];
   [[labelPlaceholder_ superview]
       replaceSubview:labelPlaceholder_ with:newLabel];
   labelPlaceholder_ = nil;  // Now released.
   [newLabel setDelegate:self];
 
   label_.reset(newLabel.release());
 }
 
 @end