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

chrome/browser/ui/cocoa/content_settings_dialog_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/content_settings_dialog_controller.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #import "chrome/browser/content_settings/content_settings_details.h"
 #import "chrome/browser/content_settings/host_content_settings_map.h"
 #import "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #import "chrome/browser/geolocation/geolocation_exceptions_table_model.h"
 #import "chrome/browser/notifications/desktop_notification_service.h"
 #import "chrome/browser/notifications/notification_exceptions_table_model.h"
 #include "chrome/browser/plugin_exceptions_table_model.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 116 matching lines @@
 
   [g_instance selectTab:settingsType];
   [g_instance showWindow:nil];
   [g_instance closeExceptionsSheet];
   return g_instance;
 }
 
 - (id)initWithProfile:(Profile*)profile {
   DCHECK(profile);
   NSString* nibpath =
-      [mac_util::MainAppBundle() pathForResource:@"ContentSettings"
+      [base::mac::MainAppBundle() pathForResource:@"ContentSettings"
                                           ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
     profile_ = profile;
 
     observer_.reset(
         new ContentSettingsDialogControllerInternal::PrefObserverBridge(self));
     clearSiteDataOnExit_.Init(prefs::kClearSiteDataOnExit,
                               profile_->GetPrefs(), observer_.get());
 
     // Manually observe notifications for preferences that are grouped in
@@ skipping 478 matching lines @@
     [self didChangeValueForKey:@"notificationsSettingIndex"];
   }
 }
 
 - (void)contentSettingsChanged:(ContentSettingsDetails*)details {
   [self prefChanged:prefs::kBlockNonsandboxedPlugins];
   [self prefChanged:prefs::kDefaultContentSettings];
 }
 
 @end