Take Keystone keys out of the framework's Info.plist

chrome/browser/cocoa/keystone_glue.mm

 // Copyright (c) 2009 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/cocoa/keystone_glue.h"
 
 #include <sys/param.h>
 #include <sys/mount.h>
 
 #include <vector>
@@ skipping 229 matching lines @@
   [appPath_ release];
   [url_ release];
   [version_ release];
   [channel_ release];
   [registration_ release];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
 - (NSDictionary*)infoDictionary {
-  // Use mac_util::MainAppBundle() to get the app framework's dictionary.
-  return [mac_util::MainAppBundle() infoDictionary];
-}
-
-- (void)loadParameters {
-  NSDictionary* infoDictionary = [self infoDictionary];
-
   // Use [NSBundle mainBundle] to get the application'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];
+}
+
+- (void)loadParameters {
   NSBundle* appBundle = [NSBundle mainBundle];
+  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:@"KSVersion"];
 
@@ skipping 619 matching lines @@
 }
 
 - (void)setAppPath:(NSString*)appPath {
   if (appPath != appPath_) {
     [appPath_ release];
     appPath_ = [appPath copy];
   }
 }
 
 @end  // @implementation KeystoneGlue