Back out r269483 and the line of fixes that followed it.

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>
 #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/files/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"
-#include "base/mac/mach_logging.h"
 #import "base/mac/mac_util.h"
 #include "base/mac/scoped_authorizationref.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/mac/dock.h"
 #import "chrome/browser/mac/keystone_glue.h"
 #include "chrome/browser/mac/relauncher.h"
@@ skipping 37 matching lines @@
   }
 
   io_iterator_t iterator_ref;
   kern_return_t kr =
       IORegistryEntryCreateIterator(media,
                                     kIOServicePlane,
                                     kIORegistryIterateRecursively |
                                         kIORegistryIterateParents,
                                     &iterator_ref);
   if (kr != KERN_SUCCESS) {
-    MACH_LOG(ERROR, kr) << "IORegistryEntryCreateIterator";
+    LOG(ERROR) << "IORegistryEntryCreateIterator: " << kr;
     return IO_OBJECT_NULL;
   }
   base::mac::ScopedIOObject<io_iterator_t> iterator(iterator_ref);
   iterator_ref = IO_OBJECT_NULL;
 
   // Look at each of the ancestor services, beginning with the parent,
   // iterating all the way up to the device tree's root. If any ancestor
   // service matches the class used for disk images, the media resides on a
   // disk image, and the disk image file's path can be determined by examining
   // the image-path property.
@@ skipping 105 matching lines @@
   if (!match_dict) {
     LOG(ERROR) << "IOBSDNameMatching " << dmg_bsd_device_name;
     return false;
   }
 
   io_iterator_t iterator_ref;
   kern_return_t kr = IOServiceGetMatchingServices(master_port,
                                                   match_dict,
                                                   &iterator_ref);
   if (kr != KERN_SUCCESS) {
-    MACH_LOG(ERROR, kr) << "IOServiceGetMatchingServices";
+    LOG(ERROR) << "IOServiceGetMatchingServices: " << kr;
     return false;
   }
   base::mac::ScopedIOObject<io_iterator_t> iterator(iterator_ref);
   iterator_ref = IO_OBJECT_NULL;
 
   // There needs to be exactly one matching service.
   base::mac::ScopedIOObject<io_service_t> media(IOIteratorNext(iterator));
   if (!media) {
     LOG(ERROR) << "IOIteratorNext: no service";
     return false;
@@ skipping 456 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;
   }
 }