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

chrome/browser/ui/cocoa/content_exceptions_window_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_exceptions_window_controller.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
 #include "app/table_model_observer.h"
 #include "base/command_line.h"
-#import "base/mac_util.h"
+#import "base/mac/mac_util.h"
 #import "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/content_exceptions_table_model.h"
 #include "chrome/browser/content_setting_combo_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 
@@ skipping 122 matching lines @@
              settingsMap:settingsMap
           otrSettingsMap:otrSettingsMap];
   }
   return g_exceptionWindows[settingsType];
 }
 
 - (id)initWithType:(ContentSettingsType)settingsType
        settingsMap:(HostContentSettingsMap*)settingsMap
     otrSettingsMap:(HostContentSettingsMap*)otrSettingsMap {
   NSString* nibpath =
-      [mac_util::MainAppBundle() pathForResource:@"ContentExceptionsWindow"
+      [base::mac::MainAppBundle() pathForResource:@"ContentExceptionsWindow"
                                           ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
     settingsType_ = settingsType;
     settingsMap_ = settingsMap;
     otrSettingsMap_ = otrSettingsMap;
     model_.reset(new ContentExceptionsTableModel(
         settingsMap_, otrSettingsMap_, settingsType_));
     popup_model_.reset(new ContentSettingComboModel(settingsType_));
     otrAllowed_ = otrSettingsMap != NULL;
     tableObserver_.reset(new UpdatingContentSettingsObserver(self));
@@ skipping 315 matching lines @@
 
   // The model caches its data, meaning we need to recreate it on every change.
   model_.reset(new ContentExceptionsTableModel(
       settingsMap_, otrSettingsMap_, settingsType_));
 
   [tableView_ reloadData];
   [self adjustEditingButtons];
 }
 
 @end