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

chrome/common/chrome_paths.cc

 // Copyright (c) 2006-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/common/chrome_paths.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 
 #if defined(OS_MACOSX)
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #endif
 
 namespace {
 
 // File name of the internal Flash plugin on different platforms.
 const FilePath::CharType kInternalFlashPluginFileName[] =
 #if defined(OS_MACOSX)
     FILE_PATH_LITERAL("Flash Player Plugin for Chrome.plugin");
 #elif defined(OS_WIN)
     FILE_PATH_LITERAL("gcswf32.dll");
 #else  // OS_LINUX, etc.
     FILE_PATH_LITERAL("libgcflashplayer.so");
 #endif
 
 }  // namespace
 
 namespace chrome {
 
 // Gets the path for internal plugins.
 bool GetInternalPluginsDirectory(FilePath* result) {
 #if defined(OS_MACOSX)
   // If called from Chrome, get internal plugins from a subdirectory of the
   // framework.
-  if (mac_util::AmIBundled()) {
+  if (base::mac::AmIBundled()) {
     *result = chrome::GetFrameworkBundlePath();
     DCHECK(!result->empty());
     *result = result->Append("Internet Plug-Ins");
     return true;
   }
   // In tests, just look in the module directory (below).
 #endif
 
   // The rest of the world expects plugins in the module directory.
   return PathService::Get(base::DIR_MODULE, result);
@@ skipping 19 matching lines @@
       return PathService::Get(base::DIR_MODULE, result);
     case chrome::DIR_LOGS:
 #ifdef NDEBUG
       // Release builds write to the data dir
       return PathService::Get(chrome::DIR_USER_DATA, result);
 #else
       // Debug builds write next to the binary (in the build tree)
 #if defined(OS_MACOSX)
       if (!PathService::Get(base::DIR_EXE, result))
         return false;
-      if (mac_util::AmIBundled()) {
+      if (base::mac::AmIBundled()) {
         // If we're called from chrome, dump it beside the app (outside the
         // app bundle), if we're called from a unittest, we'll already
         // outside the bundle so use the exe dir.
         // exe_dir gave us .../Chromium.app/Contents/MacOS/Chromium.
         *result = result->DirName();
         *result = result->DirName();
         *result = result->DirName();
       }
       return true;
 #else
@@ skipping 45 matching lines @@
         return false;
       cur = cur.Append(FILE_PATH_LITERAL("Crash Reports"));
       create_dir = true;
       break;
     case chrome::DIR_USER_DESKTOP:
       if (!GetUserDesktop(&cur))
         return false;
       break;
     case chrome::DIR_RESOURCES:
 #if defined(OS_MACOSX)
-      cur = mac_util::MainAppBundlePath();
+      cur = base::mac::MainAppBundlePath();
       cur = cur.Append(FILE_PATH_LITERAL("Resources"));
 #else
       if (!PathService::Get(chrome::DIR_APP, &cur))
         return false;
       cur = cur.Append(FILE_PATH_LITERAL("resources"));
 #endif
       break;
     case chrome::DIR_SHARED_RESOURCES:
       if (!PathService::Get(chrome::DIR_RESOURCES, &cur))
         return false;
@@ skipping 87 matching lines @@
       cur = cur.Append(FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.dll"));
 #elif defined(OS_MACOSX)
       // TODO(noelallen) Please verify this extention name is correct.
       cur = cur.Append(FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.plugin"));
 #else  // Linux and Chrome OS
       cur = cur.Append(FILE_PATH_LITERAL("libppGoogleNaClPluginChrome.so"));
 #endif
       break;
     case chrome::FILE_RESOURCES_PACK:
 #if defined(OS_MACOSX)
-      if (mac_util::AmIBundled()) {
-        cur = mac_util::MainAppBundlePath();
+      if (base::mac::AmIBundled()) {
+        cur = base::mac::MainAppBundlePath();
         cur = cur.Append(FILE_PATH_LITERAL("Resources"))
                  .Append(FILE_PATH_LITERAL("resources.pak"));
         break;
       }
       // If we're not bundled on mac, resources.pak should be next to the
       // binary (e.g., for unit tests).
 #endif
       if (!PathService::Get(base::DIR_MODULE, &cur))
         return false;
       cur = cur.Append(FILE_PATH_LITERAL("resources.pak"));
@@ skipping 65 matching lines @@
   return true;
 }
 
 // This cannot be done as a static initializer sadly since Visual Studio will
 // eliminate this object file if there is no direct entry point into it.
 void RegisterPathProvider() {
   PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
 }
 
 }  // namespace chrome