Support "canary" as a version string modifier in Mac Chrome

chrome/browser/platform_util_mac.mm

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/platform_util.h"
 
 #include <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
-#import <CoreServices/CoreServices.h>
+#include <CoreServices/CoreServices.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/mac/scoped_aedesc.h"
 #include "base/sys_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
@@ skipping 160 matching lines @@
   return result == NSAlertFirstButtonReturn;
 }
 
 std::string GetVersionStringModifier() {
 #if defined(GOOGLE_CHROME_BUILD)
   // 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.
+  // Only ever return "", "unknown", "beta", "dev", or "canary" 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) {
     // For the stable channel, KSChannelID is not set.
     channel = @"";
-  } else if ([channel isEqual:@"beta"] || [channel isEqual:@"dev"]) {
+  } else if ([channel isEqual:@"beta"] ||
+             [channel isEqual:@"dev"] ||
+             [channel isEqual:@"canary") {
     // do nothing.
   } else {
     channel = @"unknown";
   }
 
   return base::SysNSStringToUTF8(channel);
 #else
   return std::string();
 #endif
 }
 
 }  // namespace platform_util