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

chrome/browser/browser_main_mac.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 "chrome/browser/browser_main_posix.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/app_switches.h"
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/file_path.h"
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #include "base/nss_util.h"
 #include "base/path_service.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/app/breakpad_mac.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/browser_main_win.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
 #import "chrome/browser/ui/cocoa/keystone_glue.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 37 matching lines @@
 
 class BrowserMainPartsMac : public BrowserMainPartsPosix {
  public:
   explicit BrowserMainPartsMac(const MainFunctionParams& parameters)
       : BrowserMainPartsPosix(parameters) {}
 
  protected:
   virtual void PreEarlyInitialization() {
     BrowserMainPartsPosix::PreEarlyInitialization();
 
-    if (mac_util::WasLaunchedAsHiddenLoginItem()) {
+    if (base::mac::WasLaunchedAsHiddenLoginItem()) {
       CommandLine* singleton_command_line = CommandLine::ForCurrentProcess();
       singleton_command_line->AppendSwitch(switches::kNoStartupWindow);
     }
   }
 
   virtual void PreMainMessageLoopStart() {
     BrowserMainPartsPosix::PreMainMessageLoopStart();
 
     // Tell Cooca to finish its initalization, which we want to do manually
     // instead of calling NSApplicationMain(). The primary reason is that NSAM()
@@ skipping 22 matching lines @@
       CHECK(!loaded_locale.empty()) << "Default locale could not be found";
 
       FilePath resources_pack_path;
       PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
       ResourceBundle::AddDataPackToSharedInstance(resources_pack_path);
     }
 
     // Now load the nib (from the right bundle).
     scoped_nsobject<NSNib>
         nib([[NSNib alloc] initWithNibNamed:@"MainMenu"
-                                     bundle:mac_util::MainAppBundle()]);
+                                     bundle:base::mac::MainAppBundle()]);
     // TODO(viettrungluu): crbug.com/20504 - This currently leaks, so if you
     // change this, you'll probably need to change the Valgrind suppression.
     [nib instantiateNibWithOwner:NSApp topLevelObjects:nil];
     // Make sure the app controller has been created.
     DCHECK([NSApp delegate]);
 
     // This is a no-op if the KeystoneRegistration framework is not present.
     // The framework is only distributed with branded Google Chrome builds.
     [[KeystoneGlue defaultKeystoneGlue] registerWithKeystone];
 
@@ skipping 15 matching lines @@
       base::EnsureNSPRInit();
     }
   }
 };
 
 // static
 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts(
     const MainFunctionParams& parameters) {
   return new BrowserMainPartsMac(parameters);
 }