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

chrome/browser/platform_util_mac.mm

 // Copyright (c) 2010 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/platform_util.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
@@ skipping 55 matching lines @@
   NSAlert* alert = [[[NSAlert alloc] init] autorelease];
   [alert addButtonWithTitle:l10n_util::GetNSString(IDS_OK)];
   [alert setMessageText:base::SysUTF16ToNSString(title)];
   [alert setInformativeText:base::SysUTF16ToNSString(message)];
   [alert setAlertStyle:NSWarningAlertStyle];
   [alert runModal];
 }
 
 string16 GetVersionStringModifier() {
 #if defined(GOOGLE_CHROME_BUILD)
-  NSBundle* bundle = mac_util::MainAppBundle();
+  // Use the main application bundle and not the framework bundle. Keystone
+  // keys don't live in the framework.
+  NSBundle* bundle = [NSBundle mainBundle];
   NSString* channel = [bundle objectForInfoDictionaryKey:@"KSChannelID"];
 
   // Only ever return "", "unknown", "beta" or "dev" in a branded build.
   if (![bundle objectForInfoDictionaryKey:@"KSProductID"]) {
     // This build is not Keystone-enabled, it can't have a channel.
     channel = @"unknown";
-  } else if (!channel || [channel isEqual:@"stable"]) {
+  } else if (!channel) {
     // For the stable channel, KSChannelID is not set.
     channel = @"";
   } else if ([channel isEqual:@"beta"] || [channel isEqual:@"dev"]) {
     // do nothing.
   } else {
     channel = @"unknown";
   }
 
   return base::SysNSStringToUTF16(channel);
 #else
   return string16();
 #endif
 }
 
 }  // namespace platform_util