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

webkit/plugins/npapi/plugin_list_mac.mm

 // Copyright (c) 2006-2009 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/plugins/npapi/plugin_list.h"
 
 #import <Foundation/Foundation.h>
 
 #include "base/file_util.h"
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "webkit/plugins/npapi/plugin_lib.h"
 
 namespace webkit {
 namespace npapi {
 
 namespace {
 
 void GetPluginCommonDirectory(std::vector<FilePath>* plugin_dirs,
                               bool user) {
   // Note that there are no NSSearchPathDirectory constants for these
   // directories so we can't use Cocoa's NSSearchPathForDirectoriesInDomains().
   // Interestingly, Safari hard-codes the location (see
   // WebKit/WebKit/mac/Plugins/WebPluginDatabase.mm's +_defaultPlugInPaths).
   FSRef ref;
   OSErr err = FSFindFolder(user ? kUserDomain : kLocalDomain,
                            kInternetPlugInFolderType, false, &ref);
 
   if (err)
     return;
 
-  plugin_dirs->push_back(FilePath(mac_util::PathFromFSRef(ref)));
+  plugin_dirs->push_back(FilePath(base::mac::PathFromFSRef(ref)));
 }
 
 // Returns true if the plugin should be prevented from loading.
 bool IsBlacklistedPlugin(const WebPluginInfo& info) {
   // We blacklist Gears by included MIME type, since that is more stable than
   // its name. Be careful about adding any more plugins to this list though,
   // since it's easy to accidentally blacklist plugins that support lots of
   // MIME types.
   for (std::vector<WebPluginMimeType>::const_iterator i =
            info.mime_types.begin(); i != info.mime_types.end(); ++i) {
@@ skipping 55 matching lines @@
     if ((*plugins)[i].path.BaseName() == info.path.BaseName()) {
       return false;  // We already have a loaded plugin higher in the hierarchy.
     }
   }
 
   return true;
 }
 
 }  // namespace npapi
 }  // namespace webkit