mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef.

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"
 
 #import <AppKit/AppKit.h>
 #include <ApplicationServices/ApplicationServices.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreServices/CoreServices.h>
@@ skipping 103 matching lines @@
     image_path->clear();
   }
 
   base::mac::ScopedIOObject<io_service_t> hdix_drive(
       CopyHDIXDriveServiceForMedia(media));
   if (!hdix_drive) {
     return false;
   }
 
   if (image_path) {
-    base::mac::ScopedCFTypeRef<CFTypeRef> image_path_cftyperef(
-        IORegistryEntryCreateCFProperty(hdix_drive,
-                                        CFSTR("image-path"),
-                                        NULL,
-                                        0));
+    base::ScopedCFTypeRef<CFTypeRef> image_path_cftyperef(
+        IORegistryEntryCreateCFProperty(
+            hdix_drive, CFSTR("image-path"), NULL, 0));

[Mark Mentovai, 2013/06/21 20:29:40]

Here’s another, although it’s arguably less of a “readability” issue here, the
existing formatting was just fine.

     if (!image_path_cftyperef) {
       LOG(ERROR) << "IORegistryEntryCreateCFProperty";
       return true;
     }
     if (CFGetTypeID(image_path_cftyperef) != CFDataGetTypeID()) {
-      base::mac::ScopedCFTypeRef<CFStringRef> observed_type_cf(
+      base::ScopedCFTypeRef<CFStringRef> observed_type_cf(
           CFCopyTypeIDDescription(CFGetTypeID(image_path_cftyperef)));
       std::string observed_type;
       if (observed_type_cf) {
         observed_type.assign(", observed ");
         observed_type.append(base::SysCFStringRefToUTF8(observed_type_cf));
       }
       LOG(ERROR) << "image-path: expected CFData, observed " << observed_type;
       return true;
     }
 
@@ skipping 364 matching lines @@
 
 // A small structure used to ferry data between SynchronousDAOperation and
 // SynchronousDACallbackAdapter.
 struct SynchronousDACallbackData {
  public:
   SynchronousDACallbackData()
       : callback_called(false),
         run_loop_running(false) {
   }
 
-  base::mac::ScopedCFTypeRef<DADissenterRef> dissenter;
+  base::ScopedCFTypeRef<DADissenterRef> dissenter;
   bool callback_called;
   bool run_loop_running;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SynchronousDACallbackData);
 };
 
 // The callback target for SynchronousDAOperation. Set the fields in
 // SynchronousDACallbackData properly and then stops the run loop so that
 // SynchronousDAOperation may proceed.
@@ skipping 68 matching lines @@
 // Calls DADiskEject synchronously, returning the result.
 bool SynchronousDADiskEject(DADiskRef disk, DADiskEjectOptions options) {
   SynchronousDACallbackData callback_data;
   DADiskEject(disk, options, SynchronousDACallbackAdapter, &callback_data);
   return SynchronousDAOperation("DADiskEject", &callback_data);
 }
 
 }  // namespace
 
 void EjectAndTrashDiskImage(const std::string& dmg_bsd_device_name) {
-  base::mac::ScopedCFTypeRef<DASessionRef> session(DASessionCreate(NULL));
+  base::ScopedCFTypeRef<DASessionRef> session(DASessionCreate(NULL));
   if (!session.get()) {
     LOG(ERROR) << "DASessionCreate";
     return;
   }
 
-  base::mac::ScopedCFTypeRef<DADiskRef> disk(
+  base::ScopedCFTypeRef<DADiskRef> disk(
       DADiskCreateFromBSDName(NULL, session, dmg_bsd_device_name.c_str()));
   if (!disk.get()) {
     LOG(ERROR) << "DADiskCreateFromBSDName";
     return;
   }
 
   // dmg_bsd_device_name may only refer to part of the disk: it may be a
   // single filesystem on a larger disk. Use the "whole disk" object to
   // be able to unmount all mounted filesystems from the disk image, and eject
   // the image. This is harmless if dmg_bsd_device_name already referred to a
@@ skipping 54 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;
   }
 }