Keystone auto-update support for TestShell

webkit/tools/test_shell/mac/KeystoneGlue.m

 // 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 "KeystoneGlue.h"
 
 // Provide declarations of the Keystone registration bits needed here.  From
 // KSRegistration.h.
 typedef enum { kKSPathExistenceChecker } KSExistenceCheckerType;
 @interface KSRegistration : NSObject
 + (id)registrationWithProductID:(NSString*)productID;
 - (BOOL)registerWithVersion:(NSString*)version
        existenceCheckerType:(KSExistenceCheckerType)xctype
      existenceCheckerString:(NSString*)xc
             serverURLString:(NSString*)serverURLString;
 - (void)setActive;
 @end
 
 @implementation KeystoneGlue
 
+// TODO(mmentovai): Determine if the app is writable, and don't register for
+// updates if not - but keep the periodic activity pings.
 + (void)registerWithKeystone {
   // Figure out who we are.
   NSBundle* mainBundle = [NSBundle mainBundle];
   NSString* bundleIdentifier = [mainBundle bundleIdentifier];
   NSDictionary* infoDictionary = [mainBundle infoDictionary];
   NSString* url = [infoDictionary objectForKey:@"KSUpdateURL"];
-  NSString* version = [infoDictionary objectForKey:(id)kCFBundleVersionKey];
+  // TODO(mmentovai): The svn version serves our purposes for now, but it will
+  // likely be replaced.  The key problem is that it does not monotonically
+  // increase for releases when considering svn branches and tags.  For the
+  // purposes of TestShell, though, which will likely only ever survive in
+  // auto-updatable form in builds straight from the trunk, this is fine.
+  NSString* version = [infoDictionary objectForKey:@"SVNRevision"];
   if (!bundleIdentifier || !url || !version) {
     // If parameters required for Keystone are missing, don't use it.
     return;
   }
 
   // Load the KeystoneRegistration framework bundle.
   NSString* ksrPath =
       [[mainBundle privateFrameworksPath]
           stringByAppendingPathComponent:@"KeystoneRegistration.framework"];
   NSBundle* ksrBundle = [NSBundle bundleWithPath:ksrPath];
@@ skipping 24 matching lines @@
                                  userInfo:ksr
                                   repeats:YES];
 }
 
 + (void)markActive:(NSTimer*)timer {
   KSRegistration* ksr = [timer userInfo];
   [ksr setActive];
 }
 
 @end