Move authorization_util files into base/mac.

chrome/browser/mac/install_from_dmg.mm

 // Copyright (c) 2012 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 "chrome/browser/mac/install_from_dmg.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 #import <AppKit/AppKit.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreServices/CoreServices.h>
 #include <DiskArbitration/DiskArbitration.h>
 #include <IOKit/IOKitLib.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
+#include "base/mac/authorization_util.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_logging.h"
 #import "base/mac/mac_util.h"
+#include "base/mac/scoped_authorizationref.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
-#include "chrome/browser/mac/authorization_util.h"
 #include "chrome/browser/mac/dock.h"
-#include "chrome/browser/mac/scoped_authorizationref.h"
 #include "chrome/browser/mac/scoped_ioobject.h"
 #import "chrome/browser/mac/keystone_glue.h"
 #include "chrome/browser/mac/relauncher.h"
 #include "chrome/common/chrome_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 // When C++ exceptions are disabled, the C++ library defines |try| and
@@ skipping 228 matching lines @@
 // application_directory.  Returns NULL if authorization fails.
 AuthorizationRef MaybeShowAuthorizationDialog(NSString* application_directory) {
   NSFileManager* file_manager = [NSFileManager defaultManager];
   if ([file_manager isWritableFileAtPath:application_directory]) {
     return NULL;
   }
 
   NSString* prompt = l10n_util::GetNSStringFWithFixup(
       IDS_INSTALL_FROM_DMG_AUTHENTICATION_PROMPT,
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
-  return authorization_util::AuthorizationCreateToRunAsRoot(
+  return base::mac::AuthorizationCreateToRunAsRoot(
       base::mac::NSToCFCast(prompt));
 }
 
 // Invokes the installer program at installer_path to copy source_path to
 // target_path and perform any additional on-disk bookkeeping needed to be
 // able to launch target_path properly.  If authorization_arg is non-NULL,
 // function will assume ownership of it, will invoke the installer with that
 // authorization reference, and will attempt Keystone ticket promotion.
 bool InstallFromDiskImage(AuthorizationRef authorization_arg,
                           NSString* installer_path,
                           NSString* source_path,
                           NSString* target_path) {
-  ScopedAuthorizationRef authorization(authorization_arg);
+  base::mac::ScopedAuthorizationRef authorization(authorization_arg);
   authorization_arg = NULL;
   int exit_status;
   if (authorization) {
     const char* installer_path_c = [installer_path fileSystemRepresentation];
     const char* source_path_c = [source_path fileSystemRepresentation];
     const char* target_path_c = [target_path fileSystemRepresentation];
     const char* arguments[] = {source_path_c, target_path_c, NULL};
 
-    OSStatus status = authorization_util::ExecuteWithPrivilegesAndWait(
+    OSStatus status = base::mac::ExecuteWithPrivilegesAndWait(
         authorization,
         installer_path_c,
         kAuthorizationFlagDefaults,
         arguments,
         NULL,  // pipe
         &exit_status);
     if (status != errAuthorizationSuccess) {
       OSSTATUS_LOG(ERROR, status)
           << "AuthorizationExecuteWithPrivileges install";
       return false;
@@ skipping 126 matching lines @@
       [base::mac::FrameworkBundle() pathForResource:@"install" ofType:@"sh"];
   if (!installer_path) {
     VLOG(1) << "Could not locate install.sh";
     return false;
   }
 
   if (!ShouldInstallDialog()) {
     return false;
   }
 
-  ScopedAuthorizationRef authorization(
+  base::mac::ScopedAuthorizationRef authorization(
       MaybeShowAuthorizationDialog(application_directory));
   // authorization will be NULL if it's deemed unnecessary or if
   // authentication fails.  In either case, try to install without privilege
   // escalation.
 
   if (!InstallFromDiskImage(authorization.release(),
                             installer_path,
                             source_path,
                             target_path)) {
     ShowErrorDialog();
@@ skipping 214 matching lines @@
   const UInt8* trash_path_u8 = reinterpret_cast<const UInt8*>(
       trash_path.value().c_str());
   status = FNNotifyByPath(trash_path_u8,
                           kFNDirectoryModifiedMessage,
                           kNilOptions);
   if (status != noErr) {
     OSSTATUS_LOG(ERROR, status) << "FNNotifyByPath";
     return;
   }
 }