Transition to base/mac/bundle_locations.h step 3

chrome/browser/mac/install_from_dmg.mm

 // Copyright (c) 2011 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/bundle_locations.h"
 #import "base/mac/mac_util.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"
@@ skipping 193 matching lines @@
 
   return MediaResidesOnDiskImage(media, NULL);
 }
 
 // Returns true if the application is located on a read-only filesystem of a
 // disk image. Returns false if not, or in the event of an error. If
 // dmg_bsd_device_name is present, it will be set to the BSD device name for
 // the disk image's device, in "diskNsM" form.
 bool IsAppRunningFromReadOnlyDiskImage(std::string* dmg_bsd_device_name) {
   return IsPathOnReadOnlyDiskImage(
-      [[[NSBundle mainBundle] bundlePath] fileSystemRepresentation],
+      [[base::mac::OuterBundle() bundlePath] fileSystemRepresentation],
       dmg_bsd_device_name);
 }
 
 // Shows a dialog asking the user whether or not to install from the disk
 // image.  Returns true if the user approves installation.
 bool ShouldInstallDialog() {
   NSString* title = l10n_util::GetNSStringFWithFixup(
       IDS_INSTALL_FROM_DMG_TITLE, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   NSString* prompt = l10n_util::GetNSStringFWithFixup(
       IDS_INSTALL_FROM_DMG_PROMPT, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
@@ skipping 169 matching lines @@
 
   BOOL is_directory;
   if (![file_manager fileExistsAtPath:application_directory
                           isDirectory:&is_directory] ||
       !is_directory) {
     VLOG(1) << "No application directory at "
             << [application_directory UTF8String];
     return false;
   }
 
-  NSString* source_path = [[NSBundle mainBundle] bundlePath];
+  NSString* source_path = [base::mac::OuterBundle() bundlePath];
   NSString* application_name = [source_path lastPathComponent];
   NSString* target_path =
       [application_directory stringByAppendingPathComponent:application_name];
 
   if ([file_manager fileExistsAtPath:target_path]) {
     VLOG(1) << "Something already exists at " << [target_path UTF8String];
     return false;
   }
 
   NSString* installer_path =
@@ skipping 235 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) {
     LOG(ERROR) << "FNNotifyByPath: " << status;
     return;
   }
 }