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

chrome/browser/ui/cocoa/bug_report_window_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 "chrome/browser/ui/cocoa/bug_report_window_controller.h"
 
 #include "app/l10n_util_mac.h"
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bug_report_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 
 @implementation BugReportWindowController
 
 @synthesize bugDescription = bugDescription_;
 @synthesize bugTypeIndex = bugTypeIndex_;
 @synthesize pageURL = pageURL_;
 @synthesize pageTitle = pageTitle_;
 @synthesize sendScreenshot = sendScreenshot_;
 @synthesize disableScreenshotCheckbox = disableScreenshotCheckbox_;
 @synthesize bugTypeList = bugTypeList_;
 
 - (id)initWithTabContents:(TabContents*)currentTab
                   profile:(Profile*)profile {
-  NSString* nibpath = [mac_util::MainAppBundle() pathForResource:@"ReportBug"
+  NSString* nibpath = [base::mac::MainAppBundle() pathForResource:@"ReportBug"
                                                           ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
     currentTab_ = currentTab;
     profile_ = profile;
 
     // The order of strings in this array must match the order of the bug types
     // declared below in the bugTypeFromIndex function.
     bugTypeList_ = [[NSMutableArray alloc] initWithObjects:
         l10n_util::GetNSStringWithFixup(IDS_BUGREPORT_CHROME_MISBEHAVES),
         l10n_util::GetNSStringWithFixup(IDS_BUGREPORT_SOMETHING_MISSING),
@@ skipping 15 matching lines @@
               l10n_util::GetNSStringWithFixup(IDS_BUGREPORT_PAGE_WONT_LOAD),
               l10n_util::GetNSStringWithFixup(IDS_BUGREPORT_PAGE_LOOKS_ODD),
               l10n_util::GetNSStringWithFixup(IDS_BUGREPORT_PHISHING_PAGE),
               l10n_util::GetNSStringWithFixup(IDS_BUGREPORT_CANT_SIGN_IN),
               nil]
           atIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, 4)]];
 
       [self setPageURL:base::SysUTF8ToNSString(
           currentTab_->controller().GetActiveEntry()->url().spec())];
       [self setPageTitle:base::SysUTF16ToNSString(currentTab_->GetTitle())];
-      mac_util::GrabWindowSnapshot(
+      base::mac::GrabWindowSnapshot(
           currentTab_->view()->GetTopLevelNativeWindow(), &pngData_,
           &pngWidth_, &pngHeight_);
     } else {
       // If no current tab exists, create a menu without the "broken page"
       // options, with page URL and title empty, and screenshot disabled.
       [self setSendScreenshot:NO];
       [self setDisableScreenshotCheckbox:YES];
     }
 
     pngHeight_ = 0;
@@ skipping 146 matching lines @@
 + (NSSet*)keyPathsForValuesAffectingValueForKey:(NSString*)key {
   NSSet* paths = [super keyPathsForValuesAffectingValueForKey:key];
   if ([key isEqualToString:@"isPhishingReport"]) {
     paths = [paths setByAddingObject:@"bugTypeIndex"];
   }
   return paths;
 }
 
 @end