Transition to base/mac/bundle_locations.h step 3

chrome/browser/mac/keystone_glue.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.
 
 #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/bundle_locations.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"
@@ skipping 227 matching lines @@
   [appPath_ release];
   [url_ release];
   [version_ release];
   [channel_ release];
   [registration_ release];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
 - (NSDictionary*)infoDictionary {
-  // Use [NSBundle mainBundle] to get the application's own bundle identifier
+  // Use base::mac::OuterBundle() to get the Chrome app's own bundle identifier
   // and path, not the framework's.  For auto-update, the application is
   // what's significant here: it's used to locate the outermost part of the
   // application for the existence checker and other operations that need to
   // see the entire application bundle.
-  return [[NSBundle mainBundle] infoDictionary];
+  return [base::mac::OuterBundle() infoDictionary];
 }
 
 - (void)loadParameters {
-  NSBundle* appBundle = [NSBundle mainBundle];
+  NSBundle* appBundle = base::mac::OuterBundle();
   NSDictionary* infoDictionary = [self infoDictionary];
 
   NSString* productID = [infoDictionary objectForKey:@"KSProductID"];
   if (productID == nil) {
     productID = [appBundle bundleIdentifier];
   }
 
   NSString* appPath = [appBundle bundlePath];
   NSString* url = [infoDictionary objectForKey:@"KSUpdateURL"];
   NSString* version = [infoDictionary objectForKey:kVersionKey];
@@ skipping 454 matching lines @@
 
   // Check the outermost bundle directory, the main executable path, and the
   // framework directory.  It may be enough to just look at the outermost
   // bundle directory, but checking an interior file and directory can be
   // helpful in case permissions are set differently only on the outermost
   // directory.  An interior file and directory are both checked because some
   // file operations, such as Snow Leopard's Finder's copy operation when
   // authenticating, may actually result in different ownership being applied
   // to files and directories.
   NSFileManager* fileManager = [NSFileManager defaultManager];
-  NSString* executablePath = [[NSBundle mainBundle] executablePath];
+  NSString* executablePath = [base::mac::OuterBundle() executablePath];
   NSString* frameworkPath = [base::mac::MainAppBundle() bundlePath];
   return ![fileManager isWritableFileAtPath:appPath_] ||
          ![fileManager isWritableFileAtPath:executablePath] ||
          ![fileManager isWritableFileAtPath:frameworkPath];
 }
 
 - (BOOL)wantsPromotion {
   if ([self needsPromotion]) {
     return YES;
   }
@@ skipping 225 matching lines @@
   return [KeystoneGlue defaultKeystoneGlue] != nil;
 }
 
 string16 CurrentlyInstalledVersion() {
   KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue];
   NSString* version = [keystoneGlue currentlyInstalledVersion];
   return base::SysNSStringToUTF16(version);
 }
 
 }  // namespace keystone_glue