Make UpgradeDetector work on the Mac

chrome/browser/cocoa/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/browser/cocoa/keystone_glue.h"
 
 #include <sys/param.h>
 #include <sys/mount.h>
 
 #include <vector>
 
 #import "app/l10n_util_mac.h"
 #include "base/logging.h"
 #include "base/mac_util.h"
+#include "base/sys_string_conversions.h"
 #import "base/worker_pool_mac.h"
 #include "chrome/browser/cocoa/authorization_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
 // Provide declarations of the Keystone registration bits needed here.  From
 // KSRegistration.h.
@@ skipping 94 matching lines @@
 - (void)registrationComplete:(NSNotification*)notification;
 
 // Called periodically to announce activity by pinging the Keystone server.
 - (void)markActive:(NSTimer*)timer;
 
 // Called when an update check or update installation is complete.  Posts the
 // kAutoupdateStatusNotification notification to the default notification
 // center.
 - (void)updateStatus:(AutoupdateStatus)status version:(NSString*)version;
 
+// Returns the version of the currently-installed application on disk.
+- (NSString*)currentlyInstalledVersion;
+
 // These three methods are used to determine the version of the application
 // currently installed on disk, compare that to the currently-running version,
 // decide whether any updates have been installed, and call
 // -updateStatus:version:.
 //
 // In order to check the version on disk, the installed application's
 // Info.plist dictionary must be read; in order to see changes as updates are
 // applied, the dictionary must be read each time, bypassing any caches such
 // as the one that NSBundle might be maintaining.  Reading files can be a
 // blocking operation, and blocking operations are to be avoided on the main
@@ skipping 400 matching lines @@
     [self updateStatus:kAutoupdateInstallFailed version:nil];
   } else {
     updateSuccessfullyInstalled_ = YES;
 
     // Nothing in the notification dictionary reports the version that was
     // installed.  Figure it out based on what's on disk.
     [self determineUpdateStatusAsync];
   }
 }
 
+- (NSString*)currentlyInstalledVersion {
+  NSString* appInfoPlistPath = [self appInfoPlistPath];
+  NSDictionary* infoPlist =
+      [NSDictionary dictionaryWithContentsOfFile:appInfoPlistPath];
+  return [infoPlist objectForKey:@"CFBundleShortVersionString"];
+}
+
 // Runs on the main thread.
 - (void)determineUpdateStatusAsync {
   DCHECK([NSThread isMainThread]);
 
   SEL selector = @selector(determineUpdateStatus);
   NSInvocationOperation* operation =
       [[[NSInvocationOperation alloc] initWithTarget:self
                                             selector:selector
                                               object:nil] autorelease];
 
   NSOperationQueue* operationQueue = [WorkerPoolObjC sharedOperationQueue];
   [operationQueue addOperation:operation];
 }
 
 // Runs on a thread managed by NSOperationQueue.
 - (void)determineUpdateStatus {
   DCHECK(![NSThread isMainThread]);
 
-  NSString* appInfoPlistPath = [self appInfoPlistPath];
-  NSDictionary* infoPlist =
-      [NSDictionary dictionaryWithContentsOfFile:appInfoPlistPath];
-  NSString* version = [infoPlist objectForKey:@"CFBundleShortVersionString"];
+  NSString* version = [self currentlyInstalledVersion];
 
   [self performSelectorOnMainThread:@selector(determineUpdateStatusForVersion:)
                          withObject:version
                       waitUntilDone:NO];
 }
 
 // Runs on the main thread.
 - (void)determineUpdateStatusForVersion:(NSString*)version {
   DCHECK([NSThread isMainThread]);
 
@@ skipping 310 matching lines @@
 }
 
 - (void)setAppPath:(NSString*)appPath {
   if (appPath != appPath_) {
     [appPath_ release];
     appPath_ = [appPath copy];
   }
 }
 
 @end  // @implementation KeystoneGlue
+
+namespace keystone_glue {
+
+bool KeystoneEnabled() {
+  return [KeystoneGlue defaultKeystoneGlue] != nil;
+}
+
+string16 CurrentlyInstalledVersion() {
+  KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue];
+  NSString* version = [keystoneGlue currentlyInstalledVersion];
+  return base::SysNSStringToUTF16(version);
+}
+
+}  // namespace keystone_glue