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

chrome/browser/ui/cocoa/cocoa_test_helper.mm

 // Copyright (c) 2009 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/cocoa_test_helper.h"
 
 #include "base/debug/debugger.h"
 #include "base/logging.h"
+#include "base/mac/mac_util.h"
 #include "base/test/test_timeouts.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
 
 @implementation CocoaTestHelperWindow
 
 - (id)initWithContentRect:(NSRect)contentRect {
   return [self initWithContentRect:contentRect
                          styleMask:NSBorderlessWindowMask
                            backing:NSBackingStoreBuffered
                              defer:NO];
@@ skipping 53 matching lines @@
 CocoaTest::~CocoaTest() {
   // Must call CocoaTest's teardown from your overrides.
   DCHECK(called_tear_down_);
 }
 
 void CocoaTest::BootstrapCocoa() {
   // Look in the framework bundle for resources.
   FilePath path;
   PathService::Get(base::DIR_EXE, &path);
   path = path.Append(chrome::kFrameworkName);
-  mac_util::SetOverrideAppBundlePath(path);
+  base::mac::SetOverrideAppBundlePath(path);
 
   // Bootstrap Cocoa. It's very unhappy without this.
   [CrApplication sharedApplication];
 }
 
 void CocoaTest::TearDown() {
   called_tear_down_ = true;
   // Call close on our test_window to clean it up if one was opened.
   [test_window_ close];
   test_window_ = nil;
@@ skipping 31 matching lines @@
     // reset if progress is made.
     std::set<NSWindow*> still_left = windows_left;
 
     NSDate* start_date = [NSDate date];
     bool one_more_time = true;
     int spins = 0;
     while (still_left.size() == windows_left.size() &&
            (spins < kCloseSpins || one_more_time)) {
       // Check the timeout before pumping events, so that we'll spin
       // the loop once after the timeout.
-      one_more_time = ([start_date timeIntervalSinceNow] > -kCloseTimeoutSeconds);
+      one_more_time =
+          ([start_date timeIntervalSinceNow] > -kCloseTimeoutSeconds);
 
       // Autorelease anything thrown up by the event loop.
       {
         base::mac::ScopedNSAutoreleasePool pool;
         ++spins;
         NSEvent *next_event = [NSApp nextEventMatchingMask:NSAnyEventMask
                                                  untilDate:nil
                                                     inMode:NSDefaultRunLoopMode
                                                    dequeue:YES];
         [NSApp sendEvent:next_event];
@@ skipping 51 matching lines @@
   if (!test_window_) {
     test_window_ = [[CocoaTestHelperWindow alloc] init];
     if (base::debug::BeingDebugged()) {
       [test_window_ orderFront:nil];
     } else {
       [test_window_ orderBack:nil];
     }
   }
   return test_window_;
 }