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

chrome/test/unit/chrome_test_suite.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 "chrome/test/unit/chrome_test_suite.h"
 
 #include "app/app_paths.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/metrics/stats_table.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/testing_browser_process.h"
 #include "net/base/net_errors.h"
 
 #if defined(OS_MACOSX)
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #endif
 
 #if defined(OS_POSIX)
 #include "base/shared_memory.h"
 #endif
 
 static void RemoveSharedMemoryFile(const std::string& filename) {
   // Stats uses SharedMemory under the hood. On posix, this results in a file
   // on disk.
 #if defined(OS_POSIX)
@@ skipping 66 matching lines @@
   if (!browser_dir_.empty()) {
     PathService::Override(base::DIR_EXE, browser_dir_);
     PathService::Override(base::DIR_MODULE, browser_dir_);
   }
 
 #if defined(OS_MACOSX)
   // 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);
 #endif
 
   // Force unittests to run using en-US so if we test against string
   // output, it'll pass regardless of the system language.
   ResourceBundle::InitSharedInstance("en-US");
 
   // initialize the global StatsTable for unit_tests (make sure the file
   // doesn't exist before opening it so the test gets a clean slate)
   stats_filename_ = "unit_tests";
   std::string pid_string = StringPrintf("-%d", base::GetCurrentProcId());
   stats_filename_ += pid_string;
   RemoveSharedMemoryFile(stats_filename_);
   stats_table_ = new base::StatsTable(stats_filename_, 20, 200);
   base::StatsTable::set_current(stats_table_);
 }
 
 void ChromeTestSuite::Shutdown() {
   ResourceBundle::CleanupSharedInstance();
 
 #if defined(OS_MACOSX)
-  mac_util::SetOverrideAppBundle(NULL);
+  base::mac::SetOverrideAppBundle(NULL);
 #endif
 
   delete g_browser_process;
   g_browser_process = NULL;
 
   // Tear down shared StatsTable; prevents unit_tests from leaking it.
   base::StatsTable::set_current(NULL);
   delete stats_table_;
   RemoveSharedMemoryFile(stats_filename_);
 
   base::TestSuite::Shutdown();
 }