Branded stable channel builds should not display any text after the version

number in the About window or about:version.

The existing code assumed that KSChannelID would be set to "stable" on the
stable channel, but this is incorrect. On the stable channel, KSChannelID is
not set at all.

Originally, the code was correct, but it broke in r36375.

BUG=43357
TEST=1. Check the About window in a stable-channel build. It should show the
        version number without being adorned by the word "unknown" or any
        other text.
     2. In the same stable-channel builds, visit about:version. The Google
        Chrome line should show something like 5.0.375.29 (Official Build
        46008) without the word "unknown" or any other text.
Review URL: http://codereview.chromium.org/1990002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46541 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 1 deletions

diff --git a/chrome/browser/platform_util_mac.mm b/chrome/browser/platform_util_mac.mm
index 43d9582..745b9f5 100644
--- a/chrome/browser/platform_util_mac.mm
+++ b/chrome/browser/platform_util_mac.mm
@@ -71,8 +71,13 @@ string16 GetVersionStringModifier() {
 #if defined(GOOGLE_CHROME_BUILD)
   NSBundle* bundle = mac_util::MainAppBundle();
   NSString* channel = [bundle objectForInfoDictionaryKey:@"KSChannelID"];
+
   // Only ever return "", "unknown", "beta" or "dev" in a branded build.
-  if ([channel isEqual:@"stable"]) {
+  if (![bundle objectForInfoDictionaryKey:@"KSProductID"]) {
+    // This build is not Keystone-enabled, it can't have a channel.
+    channel = @"unknown";
+  } else if (!channel || [channel isEqual:@"stable"]) {
+    // For the stable channel, KSChannelID is not set.
     channel = @"";
   } else if ([channel isEqual:@"beta"] || [channel isEqual:@"dev"]) {
     // do nothing.