Move authorization_util files into base/mac.

chrome/browser/mac/keystone_glue.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.
 
 #import "chrome/browser/mac/keystone_glue.h"
 
 #include <sys/param.h>
 #include <sys/mount.h>
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/mac/authorization_util.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/mac/scoped_nsexception_enabler.h"
 #include "base/memory/ref_counted.h"
 #include "base/sys_string_conversions.h"
 #include "base/threading/worker_pool.h"
-#include "chrome/browser/mac/authorization_util.h"
 #import "chrome/browser/mac/keystone_registration.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_version_info.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"
 
 namespace {
 
@@ skipping 736 matching lines @@
     // Because there are multiple ways of reaching promoteTicket that might
     // not lock each other out, it may be possible to arrive here while an
     // asynchronous operation is pending, or even after promotion has already
     // occurred.  Just quietly return without doing anything.
     return;
   }
 
   NSString* prompt = l10n_util::GetNSStringFWithFixup(
       IDS_PROMOTE_AUTHENTICATION_PROMPT,
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
-  ScopedAuthorizationRef authorization(
-      authorization_util::AuthorizationCreateToRunAsRoot(
+  base::mac::ScopedAuthorizationRef authorization(
+      base::mac::AuthorizationCreateToRunAsRoot(
           base::mac::NSToCFCast(prompt)));
   if (!authorization.get()) {
     return;
   }
 
   [self promoteTicketWithAuthorization:authorization.release() synchronous:NO];
 }
 
 - (void)promoteTicketWithAuthorization:(AuthorizationRef)authorization_arg
                            synchronous:(BOOL)synchronous {
-  ScopedAuthorizationRef authorization(authorization_arg);
+  base::mac::ScopedAuthorizationRef authorization(authorization_arg);
   authorization_arg = NULL;
 
   if ([self asyncOperationPending]) {
     // Starting a synchronous operation while an asynchronous one is pending
     // could be trouble.
     return;
   }
   if (!synchronous && ![self wantsPromotion]) {
     // If operating synchronously, the call came from the installer, which
     // means that a system ticket is required.  Otherwise, only allow
@@ skipping 35 matching lines @@
   const char* userBrandFile = NULL;
   const char* systemBrandFile = NULL;
   if (brandFileType_ == kBrandFileTypeUser) {
     // Running with user level brand file, promote to the system level.
     userBrandFile = [UserBrandFilePath() fileSystemRepresentation];
     systemBrandFile = [SystemBrandFilePath() fileSystemRepresentation];
   }
   const char* arguments[] = {userBrandFile, systemBrandFile, NULL};
 
   int exit_status;
-  OSStatus status = authorization_util::ExecuteWithPrivilegesAndWait(
+  OSStatus status = base::mac::ExecuteWithPrivilegesAndWait(
       authorization,
       preflightPathC,
       kAuthorizationFlagDefaults,
       arguments,
       NULL,  // pipe
       &exit_status);
   if (status != errAuthorizationSuccess) {
     OSSTATUS_LOG(ERROR, status)
         << "AuthorizationExecuteWithPrivileges preflight";
     [self updateStatus:kAutoupdatePromoteFailed version:nil];
@@ skipping 67 matching lines @@
   PerformBridge::PostPerform(self, selector, toolPath);
 }
 
 - (void)changePermissionsForPromotionWithTool:(NSString*)toolPath {
   const char* toolPathC = [toolPath fileSystemRepresentation];
 
   const char* appPathC = [appPath_ fileSystemRepresentation];
   const char* arguments[] = {appPathC, NULL};
 
   int exit_status;
-  OSStatus status = authorization_util::ExecuteWithPrivilegesAndWait(
+  OSStatus status = base::mac::ExecuteWithPrivilegesAndWait(
       authorization_,
       toolPathC,
       kAuthorizationFlagDefaults,
       arguments,
       NULL,  // pipe
       &exit_status);
   if (status != errAuthorizationSuccess) {
     OSSTATUS_LOG(ERROR, status)
         << "AuthorizationExecuteWithPrivileges postflight";
   } else if (exit_status != 0) {
@@ skipping 54 matching lines @@
   return [KeystoneGlue defaultKeystoneGlue] != nil;
 }
 
 string16 CurrentlyInstalledVersion() {
   KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue];
   NSString* version = [keystoneGlue currentlyInstalledVersion];
   return base::SysNSStringToUTF16(version);
 }
 
 }  // namespace keystone_glue