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

webkit/tools/test_shell/run_all_tests.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.
 
 // Run all of our test shell tests.  This is just an entry point
 // to kick off gTest's RUN_ALL_TESTS().
 
 #include "base/basictypes.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <commctrl.h>
 #endif
 
 #include "base/command_line.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/test/test_suite.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_shell.h"
 #include "webkit/tools/test_shell/test_shell_platform_delegate.h"
 #include "webkit/tools/test_shell/test_shell_switches.h"
 #include "webkit/tools/test_shell/test_shell_test.h"
 #include "webkit/tools/test_shell/test_shell_webkit_init.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_MACOSX)
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #include "base/path_service.h"
 #endif
 
 const char* const TestShellTest::kJavascriptDelayExitScript =
   "<script>"
     "window.layoutTestController.waitUntilDone();"
     "window.addEventListener('load', function() {"
     "  var x = document.body.clientWidth;"  // Force a document layout
     "  window.layoutTestController.notifyDone();"
     "});"
   "</script>";
 
 class TestShellTestSuite : public base::TestSuite {
  public:
   TestShellTestSuite(int argc, char** argv)
       : base::TestSuite(argc, argv),
         test_shell_webkit_init_(true),
         platform_delegate_(*CommandLine::ForCurrentProcess()) {
   }
 
   virtual void Initialize() {
     // Override DIR_EXE early in case anything in base::TestSuite uses it.
 #if defined(OS_MACOSX)
     FilePath path;
     PathService::Get(base::DIR_EXE, &path);
     path = path.AppendASCII("TestShell.app");
-    mac_util::SetOverrideAppBundlePath(path);
+    base::mac::SetOverrideAppBundlePath(path);
 #endif
 
     base::TestSuite::Initialize();
 
     const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
 
     // Allow tests to analyze GC information from V8 log, and expose GC
     // triggering function.
     std::string js_flags =
         parsed_command_line.GetSwitchValueASCII(test_shell::kJavaScriptFlags);
@@ skipping 36 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TestShellTestSuite);
 };
 
 int main(int argc, char** argv) {
   base::mac::ScopedNSAutoreleasePool scoped_pool;
 
   TestShellPlatformDelegate::PreflightArgs(&argc, &argv);
   return TestShellTestSuite(argc, argv).Run();
 }