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

chrome/browser/ui/cocoa/preferences_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/preferences_window_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #include "base/mac/scoped_aedesc.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/autofill/autofill_dialog.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_prefs.h"
@@ skipping 458 matching lines @@
 @synthesize useSuggestEnabled = useSuggestEnabled_;
 @synthesize dnsPrefetchEnabled = dnsPrefetchEnabled_;
 @synthesize safeBrowsingEnabled = safeBrowsingEnabled_;
 @synthesize metricsReportingEnabled = metricsReportingEnabled_;
 @synthesize proxiesConfigureButtonEnabled = proxiesConfigureButtonEnabled_;
 
 - (id)initWithProfile:(Profile*)profile initialPage:(OptionsPage)initialPage {
   DCHECK(profile);
   // Use initWithWindowNibPath:: instead of initWithWindowNibName: so we
   // can override it in a unit test.
-  NSString* nibPath = [mac_util::MainAppBundle()
+  NSString* nibPath = [base::mac::MainAppBundle()
                         pathForResource:@"Preferences"
                                  ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibPath owner:self])) {
     profile_ = profile->GetOriginalProfile();
     initialPage_ = initialPage;
     prefs_ = profile->GetPrefs();
     DCHECK(prefs_);
     observer_.reset(
         new PreferencesWindowControllerInternal::PrefObserverBridge(self));
 
@@ skipping 165 matching lines @@
 
   // Now that we have the width needed for Basics and Personal Stuff, lay out
   // those pages bottom up making sure the strings fit and moving things up as
   // needed.
 
   CGFloat newWidth = NSWidth([basicsView_ frame]);
   CGFloat verticalShift = 0.0;
   verticalShift += AutoSizeGroup(basicsGroupDefaultBrowser_,
                                  kAutoSizeGroupBehaviorVerticalFirstToFit,
                                  verticalShift);
-  verticalShift += AutoSizeGroup(basicsGroupSearchEngine_,
-                                 kAutoSizeGroupBehaviorFirstTwoAsRowVerticalToFit,
-                                 verticalShift);
+  verticalShift += AutoSizeGroup(
+      basicsGroupSearchEngine_,
+      kAutoSizeGroupBehaviorFirstTwoAsRowVerticalToFit,
+      verticalShift);
   verticalShift += AutoSizeGroup(basicsGroupToolbar_,
                                  kAutoSizeGroupBehaviorVerticalToFit,
                                  verticalShift);
   verticalShift += AutoSizeGroup(basicsGroupHomePage_,
                                  kAutoSizeGroupBehaviorVerticalToFit,
                                  verticalShift);
   verticalShift += AutoSizeGroup(basicsGroupStartup_,
                                  kAutoSizeGroupBehaviorVerticalFirstToFit,
                                  verticalShift);
   [GTMUILocalizerAndLayoutTweaker
@@ skipping 1471 matching lines @@
     case OPTIONS_PAGE_ADVANCED:
       return underTheHoodView_;
     case OPTIONS_PAGE_DEFAULT:
     case OPTIONS_PAGE_COUNT:
       LOG(DFATAL) << "Invalid page value " << page;
   }
   return basicsView_;
 }
 
 @end