KSR should always support the new registration API now

chrome/app/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/app/keystone_glue.h"
 
 #include "base/logging.h"
 #include "base/mac_util.h"
 #import "base/worker_pool_mac.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 17 matching lines @@
 
 NSString *KSRegistrationRemoveExistingTag = @"";
 #define KSRegistrationPreserveExistingTag nil
 
 }  // namespace
 
 @interface KSRegistration : NSObject
 
 + (id)registrationWithProductID:(NSString*)productID;
 
-// Older API
-- (BOOL)registerWithVersion:(NSString*)version
-       existenceCheckerType:(KSExistenceCheckerType)xctype
-     existenceCheckerString:(NSString*)xc
-            serverURLString:(NSString*)serverURLString;
-// Newer API
 - (BOOL)registerWithVersion:(NSString*)version
        existenceCheckerType:(KSExistenceCheckerType)xctype
      existenceCheckerString:(NSString*)xc
             serverURLString:(NSString*)serverURLString
             preserveTTToken:(BOOL)preserveToken
                         tag:(NSString*)tag;
 
 - (void)setActive;
 - (void)checkForUpdate;
 - (void)startUpdate;
@@ skipping 140 matching lines @@
     return NO;
 
   registration_ = [ksr retain];
   return YES;
 }
 
 - (void)registerWithKeystone {
   // The existence checks should use the path to the app bundle, not the
   // app framework bundle, so use [NSBundle mainBundle] instead of
   // mac_util::MainBundle().
-  //
-  // Only use new API if we can.  This lets us land the new call
-  // before the new Keystone has been released.
-  //
-  // TODO(jrg): once we hit Beta and the new Keystone is released,
-  // make this call unconditional.
-  if ([registration_ respondsToSelector:@selector(registerWithVersion:existenceCheckerType:existenceCheckerString:serverURLString:preserveTTToken:tag:)])
-    [registration_ registerWithVersion:version_
-                  existenceCheckerType:kKSPathExistenceChecker
-                existenceCheckerString:[[NSBundle mainBundle] bundlePath]
-                       serverURLString:url_
-                       preserveTTToken:YES
-                                   tag:channel_];
-  else
-    [registration_ registerWithVersion:version_
-                  existenceCheckerType:kKSPathExistenceChecker
-                existenceCheckerString:[[NSBundle mainBundle] bundlePath]
-                       serverURLString:url_];
+  [registration_ registerWithVersion:version_
+                existenceCheckerType:kKSPathExistenceChecker
+              existenceCheckerString:[[NSBundle mainBundle] bundlePath]
+                     serverURLString:url_
+                     preserveTTToken:YES
+                                 tag:channel_];
 
   // Mark an active RIGHT NOW; don't wait an hour for the first one.
   [registration_ setActive];
 
   // Set up hourly activity pings.
   timer_ = [NSTimer scheduledTimerWithTimeInterval:60 * 60  // One hour
                                             target:self
                                           selector:@selector(markActive:)
                                           userInfo:registration_
                                            repeats:YES];
@@ skipping 166 matching lines @@
   return static_cast<AutoupdateStatus>(
       [[dictionary objectForKey:kAutoupdateStatusStatus] intValue]);
 }
 
 - (BOOL)asyncOperationPending {
   AutoupdateStatus status = [self recentStatus];
   return status == kAutoupdateChecking || status == kAutoupdateInstalling;
 }
 
 @end  // @implementation KeystoneGlue