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

chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.mm

 // Copyright (c) 2009 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 <Cocoa/Cocoa.h>
 
 #import "chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h"
 
-#import "base/mac_util.h"
+#import "base/mac/mac_util.h"
 #include "base/lazy_instance.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/search_engines/template_url_table_model.h"
 #import "chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/window_size_autosaver.h"
 #include "chrome/common/pref_names.h"
@@ skipping 119 matching lines @@
     KeywordEditorCocoaController* controller =
         [[self alloc] initWithProfile:profile];
     it = map->insert(std::make_pair(profile, controller)).first;
   }
 
   [it->second showWindow:nil];
 }
 
 - (id)initWithProfile:(Profile*)profile {
   DCHECK(profile);
-  NSString* nibpath = [mac_util::MainAppBundle()
+  NSString* nibpath = [base::mac::MainAppBundle()
                         pathForResource:@"KeywordEditor"
                                  ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
     profile_ = profile;
     controller_.reset(new KeywordEditorController(profile_));
     observer_.reset(new KeywordEditorModelObserver(self));
     controller_->table_model()->SetObserver(observer_.get());
     controller_->url_model()->AddObserver(observer_.get());
     groupCell_.reset([[NSTextFieldCell alloc] init]);
 
@@ skipping 256 matching lines @@
       controller_->table_model()->last_search_engine_index() + 1;
   DCHECK_NE(row, otherGroupId);
   if (row >= otherGroupId) {
     return row - 2;  // Other group.
   } else {
     return row - 1;  // Default group.
   }
 }
 
 @end