Move scoped_nsdisable_screen_update from base to app/mac...

chrome/browser/platform_util_mac.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.
 
 #include "chrome/browser/platform_util.h"
 
 #import <Cocoa/Cocoa.h>
 #import <CoreServices/CoreServices.h>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/mac_util.h"
-#include "base/scoped_aedesc.h"
+#include "base/mac/scoped_aedesc.h"
 #include "base/sys_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 
 namespace platform_util {
 
 void ShowItemInFolder(const FilePath& full_path) {
   DCHECK_EQ([NSThread currentThread], [NSThread mainThread]);
   NSString* path_string = base::SysUTF8ToNSString(full_path.value());
   if (!path_string || ![[NSWorkspace sharedWorkspace] selectFile:path_string
@@ skipping 10 matching lines @@
 // document.
 void OpenItem(const FilePath& full_path) {
   DCHECK_EQ([NSThread currentThread], [NSThread mainThread]);
   NSString* path_string = base::SysUTF8ToNSString(full_path.value());
   if (!path_string)
     return;
 
   OSErr status;
 
   // Create the target of this AppleEvent, the Finder.
-  scoped_aedesc<AEAddressDesc> address;
+  base::mac::ScopedAEDesc<AEAddressDesc> address;
   const OSType finderCreatorCode = 'MACS';
   status = AECreateDesc(typeApplSignature,  // type
                         &finderCreatorCode,  // data
                         sizeof(finderCreatorCode),  // dataSize
                         address.OutPointer());  // result
   if (status != noErr) {
     LOG(WARNING) << "Could not create OpenItem() AE target";
     return;
   }
 
   // Build the AppleEvent data structure that instructs Finder to open files.
-  scoped_aedesc<AppleEvent> theEvent;
+  base::mac::ScopedAEDesc<AppleEvent> theEvent;
   status = AECreateAppleEvent(kCoreEventClass,  // theAEEventClass
                               kAEOpenDocuments,  // theAEEventID
                               address,  // target
                               kAutoGenerateReturnID,  // returnID
                               kAnyTransactionID,  // transactionID
                               theEvent.OutPointer());  // result
   if (status != noErr) {
     LOG(WARNING) << "Could not create OpenItem() AE event";
     return;
   }
 
   // Create the list of files (only ever one) to open.
-  scoped_aedesc<AEDescList> fileList;
+  base::mac::ScopedAEDesc<AEDescList> fileList;
   status = AECreateList(NULL,  // factoringPtr
                         0,  // factoredSize
                         false,  // isRecord
                         fileList.OutPointer());  // resultList
   if (status != noErr) {
     LOG(WARNING) << "Could not create OpenItem() AE file list";
     return;
   }
 
   // Add the single path to the file list.  C-style cast to avoid both a
@@ skipping 18 matching lines @@
   // Attach the file list to the AppleEvent.
   status = AEPutParamDesc(theEvent.OutPointer(),  // theAppleEvent
                           keyDirectObject,  // theAEKeyword
                           fileList);  // theAEDesc
   if (status != noErr) {
     LOG(WARNING) << "Could not put the AE file list the path in OpenItem()";
     return;
   }
 
   // Send the actual event.  Do not care about the reply.
-  scoped_aedesc<AppleEvent> reply;
+  base::mac::ScopedAEDesc<AppleEvent> reply;
   status = AESend(theEvent,  // theAppleEvent
                   reply.OutPointer(),  // reply
                   kAENoReply + kAEAlwaysInteract,  // sendMode
                   kAENormalPriority,  // sendPriority
                   kAEDefaultTimeout,  // timeOutInTicks
                   NULL, // idleProc
                   NULL);  // filterProc
   if (status != noErr) {
     LOG(WARNING) << "Could not send AE to Finder in OpenItem()";
   }
@@ skipping 75 matching lines @@
     channel = @"unknown";
   }
 
   return base::SysNSStringToUTF8(channel);
 #else
   return std::string();
 #endif
 }
 
 }  // namespace platform_util