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

webkit/support/test_webkit_client.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 "webkit/support/test_webkit_client.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/metrics/stats_counters.h"
@@ skipping 39 matching lines @@
 #include "webkit/tools/test_shell/test_shell_request_context.h"
 #include "webkit/tools/test_shell/test_shell_webblobregistry_impl.h"
 #include "v8/include/v8.h"
 
 #if defined(OS_WIN)
 #include "third_party/WebKit/WebKit/chromium/public/win/WebThemeEngine.h"
 #include "webkit/tools/test_shell/test_shell_webthemeengine.h"
 #elif defined(OS_LINUX)
 #include "third_party/WebKit/WebKit/chromium/public/linux/WebThemeEngine.h"
 #elif defined(OS_MACOSX)
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #endif
 
 using WebKit::WebScriptController;
 
 TestWebKitClient::TestWebKitClient(bool unit_test_mode)
       : unit_test_mode_(unit_test_mode) {
   v8::V8::SetCounterFunction(base::StatsTable::FindLocation);
 
   WebKit::initialize(this);
   WebKit::setLayoutTestMode(true);
@@ skipping 10 matching lines @@
   WebKit::WebRuntimeFeatures::enableWebGL(true);
   WebKit::WebRuntimeFeatures::enablePushState(true);
   WebKit::WebRuntimeFeatures::enableNotifications(true);
   WebKit::WebRuntimeFeatures::enableTouch(true);
 
   // Load libraries for media and enable the media player.
   bool enable_media = false;
   FilePath module_path;
   if (PathService::Get(base::DIR_MODULE, &module_path)) {
 #if defined(OS_MACOSX)
-    if (mac_util::AmIBundled())
+    if (base::mac::AmIBundled())
       module_path = module_path.DirName().DirName().DirName();
 #endif
     if (media::InitializeMediaLibrary(module_path))
       enable_media = true;
   }
   WebKit::WebRuntimeFeatures::enableMediaPlayer(enable_media);
   LOG_IF(WARNING, !enable_media) << "Failed to initialize the media library.\n";
 
   // TODO(joth): Make a dummy geolocation service implemenation for
   // test_shell, and set this to true. http://crbug.com/36451
@@ skipping 239 matching lines @@
 }
 #endif
 
 WebKit::WebSharedWorkerRepository* TestWebKitClient::sharedWorkerRepository() {
   return NULL;
 }
 
 WebKit::WebGraphicsContext3D* TestWebKitClient::createGraphicsContext3D() {
   return WebKit::WebGraphicsContext3D::createDefault();
 }