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

chrome/browser/ui/cocoa/cookies_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/cookies_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
-#import "base/mac_util.h"
+#import "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/cocoa/clear_browsing_data_controller.h"
 #include "chrome/browser/ui/cocoa/cookie_details_view_controller.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/apple/ImageAndTextCell.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 138 matching lines @@
 
 @synthesize removeButtonEnabled = removeButtonEnabled_;
 @synthesize treeController = treeController_;
 
 - (id)initWithProfile:(Profile*)profile
        databaseHelper:(BrowsingDataDatabaseHelper*)databaseHelper
         storageHelper:(BrowsingDataLocalStorageHelper*)storageHelper
        appcacheHelper:(BrowsingDataAppCacheHelper*)appcacheHelper
       indexedDBHelper:(BrowsingDataIndexedDBHelper*)indexedDBHelper {
   DCHECK(profile);
-  NSString* nibpath = [mac_util::MainAppBundle() pathForResource:@"Cookies"
+  NSString* nibpath = [base::mac::MainAppBundle() pathForResource:@"Cookies"
                                                           ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
     profile_ = profile;
     databaseHelper_ = databaseHelper;
     storageHelper_ = storageHelper;
     appcacheHelper_ = appcacheHelper;
     indexedDBHelper_ = indexedDBHelper;
 
     [self loadTreeModelFromProfile];
 
@@ skipping 257 matching lines @@
   [icons_ addObject:rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER)];
 
   // Create the Cocoa model.
   CookieTreeNode* root = static_cast<CookieTreeNode*>(treeModel_->GetRoot());
   scoped_nsobject<CocoaCookieTreeNode> model(
       [[CocoaCookieTreeNode alloc] initWithNode:root]);
   [self setCocoaTreeModel:model.get()];  // Takes ownership.
 }
 
 @end