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

chrome/app/chrome_main.cc

 // 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 "app/app_paths.h"
 #include "app/app_switches.h"
 #include "app/resource_bundle.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
@@ skipping 30 matching lines @@
 #include <atlbase.h>
 #include <atlapp.h>
 #include <malloc.h>
 #include <new.h>
 #include "sandbox/src/sandbox.h"
 #include "tools/memory_watcher/memory_watcher.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "app/l10n_util_mac.h"
+#include "base/mac/mac_util.h"
 #include "base/mac/os_crash_dumps.h"
-#include "base/mac_util.h"
 #include "base/mach_ipc_mac.h"
 #include "chrome/app/breakpad_mac.h"
 #include "chrome/browser/mach_broker_mac.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "grit/chromium_strings.h"
 #include "third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface.h"
 #endif
 
 #if defined(OS_POSIX)
 #include <locale.h>
@@ skipping 341 matching lines @@
     name_id = IDS_RENDERER_APP_NAME;
   } else if (process_type == switches::kPluginProcess) {
     name_id = IDS_PLUGIN_APP_NAME;
   } else if (process_type == switches::kExtensionProcess) {
     name_id = IDS_WORKER_APP_NAME;
   } else if (process_type == switches::kUtilityProcess) {
     name_id = IDS_UTILITY_APP_NAME;
   }
   if (name_id) {
     NSString* app_name = l10n_util::GetNSString(name_id);
-    mac_util::SetProcessName(reinterpret_cast<CFStringRef>(app_name));
+    base::mac::SetProcessName(reinterpret_cast<CFStringRef>(app_name));
   }
 }
 
 // Completes the Mach IPC handshake by sending this process' task port to the
 // parent process.  The parent is listening on the Mach port given by
 // |GetMachPortName()|.  The task port is used by the parent to get CPU/memory
 // stats to display in the task manager.
 void SendTaskPortToParentProcess() {
   const mach_msg_timeout_t kTimeoutMs = 100;
   const int32_t kMessageId = 0;
@@ skipping 209 matching lines @@
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
   // This will directly exit if the user asked for help.
   HandleHelpSwitches(command_line);
 #endif
 #endif  // OS_POSIX
 
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
 #if defined(OS_MACOSX)
-  mac_util::SetOverrideAppBundlePath(chrome::GetFrameworkBundlePath());
+  base::mac::SetOverrideAppBundlePath(chrome::GetFrameworkBundlePath());
 #endif  // OS_MACOSX
 
   // If we are in diagnostics mode this is the end of the line. After the
   // diagnostics are run the process will invariably exit.
   if (command_line.HasSwitch(switches::kDiagnostics)) {
     return DiagnosticsMain(command_line);
   }
 
 #if defined(OS_WIN)
   // Must do this before any other usage of command line!
@@ skipping 85 matching lines @@
   //
   // What we do:
   // * We only pass crashes for foreground processes to Apple's Crash reporter.
   //    At the time of this writing, that means just the Browser process.
   // * If Breakpad is enabled, it will pass browser crashes to Crash Reporter
   //    itself.
   // * If Breakpad is disabled, we only turn on Crash Reporter for the
   //    Browser process in release mode.
   if (!command_line.HasSwitch(switches::kDisableBreakpad)) {
     bool disable_apple_crash_reporter = is_debug_build
-                                        || mac_util::IsBackgroundOnlyProcess();
+                                        || base::mac::IsBackgroundOnlyProcess();
     if (!IsCrashReporterEnabled() && disable_apple_crash_reporter) {
       base::mac::DisableOSCrashDumps();
     }
   }
 
 #if defined(OS_MACOSX)
   // Mac Chrome is packaged with a main app bundle and a helper app bundle.
   // The main app bundle should only be used for the browser process, so it
   // should never see a --type switch (switches::kProcessType).  Likewise,
   // the helper should always have a --type switch.
   //
   // This check is done this late so there is already a call to
-  // mac_util::IsBackgroundOnlyProcess(), so there is no change in
+  // base::mac::IsBackgroundOnlyProcess(), so there is no change in
   // startup/initialization order.
 
   // The helper's Info.plist marks it as a background only app.
-  if (mac_util::IsBackgroundOnlyProcess()) {
+  if (base::mac::IsBackgroundOnlyProcess()) {
     CHECK(command_line.HasSwitch(switches::kProcessType))
         << "Helper application requires --type.";
   } else {
     CHECK(!command_line.HasSwitch(switches::kProcessType))
         << "Main application forbids --type, saw \"" << process_type << "\".";
   }
 #endif  // defined(OS_MACOSX)
 
   if (IsCrashReporterEnabled())
     InitCrashProcessInfo();
@@ skipping 134 matching lines @@
 
   int exit_code = RunNamedProcessTypeMain(process_type, main_params);
 
   if (SubprocessNeedsResourceBundle(process_type))
     ResourceBundle::CleanupSharedInstance();
 
   LowLevelShutdown();
 
   return exit_code;
 }