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

chrome/browser/ui/cocoa/tabpose_window.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.
 
 #import "chrome/browser/ui/cocoa/tabpose_window.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include "app/resource_bundle.h"
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/scoped_callback_factory.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #import "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/backing_store_mac.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ skipping 992 matching lines @@
   NSImage* nsFavicon = gfx::SkBitmapToNSImage(tile.favicon());
   // Either we don't have a valid favicon or there was some issue converting
   // it from an SkBitmap. Either way, just show the default.
   if (!nsFavicon) {
     NSImage* defaultFavIcon =
         ResourceBundle::GetSharedInstance().GetNativeImageNamed(
             IDR_DEFAULT_FAVICON);
     nsFavicon = defaultFavIcon;
   }
   base::mac::ScopedCFTypeRef<CGImageRef> favicon(
-      mac_util::CopyNSImageToCGImage(nsFavicon));
+      base::mac::CopyNSImageToCGImage(nsFavicon));
 
   CALayer* faviconLayer = [CALayer layer];
   if (showZoom) {
     AnimateCALayerFrameFromTo(
         faviconLayer,
         tile.GetFaviconStartRectRelativeTo(tileSet_->selected_tile()),
         tile.favicon_rect(),
         interval,
         nil);
     AnimateCALayerOpacityFromTo(faviconLayer, 0.0, 1.0, interval);
@@ skipping 511 matching lines @@
   tile.set_tab_contents(contents->tab_contents());
   ThumbnailLayer* thumbLayer = [allThumbnailLayers_ objectAtIndex:index];
   [thumbLayer setTabContents:contents->tab_contents()];
 }
 
 - (void)tabStripModelDeleted {
   [self close];
 }
 
 @end