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

chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_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.
 
 #include <stack>
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
 #include "base/logging.h"
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "grit/generated_resources.h"
 
 @interface BookmarkEditorBaseController ()
@@ skipping 131 matching lines @@
 
 @synthesize initialName = initialName_;
 @synthesize displayName = displayName_;
 @synthesize okEnabled = okEnabled_;
 
 - (id)initWithParentWindow:(NSWindow*)parentWindow
                    nibName:(NSString*)nibName
                    profile:(Profile*)profile
                     parent:(const BookmarkNode*)parent
              configuration:(BookmarkEditor::Configuration)configuration {
-  NSString* nibpath = [mac_util::MainAppBundle()
+  NSString* nibpath = [base::mac::MainAppBundle()
                         pathForResource:nibName
                                  ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
     parentWindow_ = parentWindow;
     profile_ = profile;
     parentNode_ = parent;
     configuration_ = configuration;
     initialName_ = [@"" retain];
     observer_.reset(new BookmarkEditorBaseControllerBridge(self));
     [self bookmarkModel]->AddObserver(observer_.get());
@@ skipping 420 matching lines @@
 }
 
 // Implementing isEqual: allows the NSTreeController to preserve the selection
 // and open/shut state of outline items when the data changes.
 - (BOOL)isEqual:(id)other {
   return [other isKindOfClass:[BookmarkFolderInfo class]] &&
       folderNode_ == [(BookmarkFolderInfo*)other folderNode];
 }
 
 @end