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

Fix up callers to use the new location & namespace. Remove includes from 
files where it wasn't necessary.

TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6046009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70359 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 5 deletions

diff --git a/app/test_suite.h b/app/test_suite.h
index 1f05e13..10e6b44 100644
--- a/app/test_suite.h
+++ b/app/test_suite.h
@@ -11,12 +11,14 @@
 #include "app/app_paths.h"
 #include "app/resource_bundle.h"
 #include "base/path_service.h"
+#include "base/mac/scoped_nsautorelease_pool.h"
+#include "base/test/test_suite.h"
+#include "build/build_config.h"
+
 #if defined(OS_MACOSX)
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #include "base/test/mock_chrome_application_mac.h"
 #endif
-#include "base/mac/scoped_nsautorelease_pool.h"
-#include "base/test/test_suite.h"
 
 class AppTestSuite : public base::TestSuite {
  public:
@@ -50,7 +52,7 @@ class AppTestSuite : public base::TestSuite {
 #else
 #error Unknown branding
 #endif
-    mac_util::SetOverrideAppBundlePath(path);
+    base::mac::SetOverrideAppBundlePath(path);
 #elif defined(OS_POSIX)
     FilePath pak_dir;
     PathService::Get(base::DIR_MODULE, &pak_dir);
@@ -69,7 +71,7 @@ class AppTestSuite : public base::TestSuite {
     ResourceBundle::CleanupSharedInstance();
 
 #if defined(OS_MACOSX)
-    mac_util::SetOverrideAppBundle(NULL);
+    base::mac::SetOverrideAppBundle(NULL);
 #endif
     TestSuite::Shutdown();
   }