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

app/resource_bundle_mac.mm

 // 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 "app/resource_bundle.h"
 
 #import <Foundation/Foundation.h>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "skia/ext/skia_utils_mac.h"
 
 namespace {
 
 FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
   NSString *resource_path;
   // Some of the helper processes need to be able to fetch resources
   // (chrome_main.cc: SubprocessNeedsResourceBundle()). Fetch the same locale
   // as the already-running browser instead of using what NSBundle might pick
   // based on values at helper launch time.
   if ([mac_locale length]) {
-    resource_path = [mac_util::MainAppBundle() pathForResource:name
+    resource_path = [base::mac::MainAppBundle() pathForResource:name
                                                         ofType:@"pak"
                                                    inDirectory:@""
                                                forLocalization:mac_locale];
   } else {
-    resource_path = [mac_util::MainAppBundle() pathForResource:name
+    resource_path = [base::mac::MainAppBundle() pathForResource:name
                                                         ofType:@"pak"];
   }
   if (!resource_path)
     return FilePath();
   return FilePath([resource_path fileSystemRepresentation]);
 }
 
 }  // namespace
 
 // static
@@ skipping 19 matching lines @@
 NSImage* ResourceBundle::GetNSImageNamed(int resource_id) {
   // Currently this doesn't make a cache holding these as NSImages because
   // GetBitmapNamed has a cache, and we don't want to double cache.
   SkBitmap* bitmap = GetBitmapNamed(resource_id);
   if (!bitmap)
     return nil;
 
   NSImage* nsimage = gfx::SkBitmapToNSImage(*bitmap);
   return nsimage;
 }