Move base/mac_util.h to base/mac and use the base::mac namespace....

chrome/browser/ui/cocoa/infobar_container_controller.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 "base/logging.h"
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #import "chrome/browser/ui/cocoa/animatable_view.h"
 #include "chrome/browser/ui/cocoa/infobar.h"
 #import "chrome/browser/ui/cocoa/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/infobar_controller.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
 #include "skia/ext/skia_utils_mac.h"
@@ skipping 47 matching lines @@
 // adding together the heights of all its subviews.
 - (CGFloat)desiredHeight;
 
 @end
 
 
 @implementation InfoBarContainerController
 - (id)initWithResizeDelegate:(id<ViewResizer>)resizeDelegate {
   DCHECK(resizeDelegate);
   if ((self = [super initWithNibName:@"InfoBarContainer"
-                              bundle:mac_util::MainAppBundle()])) {
+                              bundle:base::mac::MainAppBundle()])) {
     resizeDelegate_ = resizeDelegate;
     infoBarObserver_.reset(new InfoBarNotificationObserver(self));
 
     // NSMutableArray needs an initial capacity, and we rarely ever see
     // more than two infobars at a time, so that seems like a good choice.
     infobarControllers_.reset([[NSMutableArray alloc] initWithCapacity:2]);
   }
   return self;
 }
 
@@ skipping 135 matching lines @@
     frame.size.width = NSWidth(containerBounds);
     frame.origin.y = minY;
     minY += frame.size.height;
     [view setFrame:frame];
   }
 
   [resizeDelegate_ resizeView:[self view] newHeight:[self desiredHeight]];
 }
 
 @end