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

chrome/browser/ui/cocoa/font_language_settings_controller.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/font_language_settings_controller.h"
 
 #import <Cocoa/Cocoa.h>
-#import "base/mac_util.h"
+#import "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/fonts_languages_window.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 
 NSString* const kCharacterInfoEncoding = @"encoding";
 NSString* const kCharacterInfoName = @"name";
 NSString* const kCharacterInfoID = @"id";
 
 void ShowFontsLanguagesWindow(gfx::NativeWindow window,
                               FontsLanguagesPage page,
                               Profile* profile) {
   NOTIMPLEMENTED();
 }
 
 @interface FontLanguageSettingsController (Private)
 - (void)updateDisplayField:(NSTextField*)field
                   withFont:(NSFont*)font
                  withLabel:(NSTextField*)label;
 @end
 
 @implementation FontLanguageSettingsController
 
 - (id)initWithProfile:(Profile*)profile {
   DCHECK(profile);
-  NSString* nibpath = [mac_util::MainAppBundle()
+  NSString* nibpath = [base::mac::MainAppBundle()
                         pathForResource:@"FontLanguageSettings"
                                  ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
     profile_ = profile;
 
     // Convert the name/size preference values to NSFont objects.
     serifName_.Init(prefs::kWebKitSerifFontFamily, profile->GetPrefs(), NULL);
     serifSize_.Init(prefs::kWebKitDefaultFontSize, profile->GetPrefs(), NULL);
     NSString* serif = base::SysUTF8ToNSString(serifName_.GetValue());
     serifFont_.reset(
@@ skipping 224 matching lines @@
     return;
   }
   [field setFont:font];
   NSString* value =
       [NSString stringWithFormat:@"%@, %g", [font fontName], [font pointSize]];
   [field setStringValue:value];
   [field setFrameOrigin:[self getFontFieldOrigin:field forLabel:label]];
 }
 
 @end