Map update check failure to "update server not available."

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"
 
+namespace {
+
 // Provide declarations of the Keystone registration bits needed here.  From
 // KSRegistration.h.
 typedef enum { kKSPathExistenceChecker } KSExistenceCheckerType;
 
 NSString *KSRegistrationCheckForUpdateNotification =
     @"KSRegistrationCheckForUpdateNotification";
 NSString *KSRegistrationStatusKey = @"Status";
 NSString *KSRegistrationVersionKey = @"Version";
+NSString *KSRegistrationUpdateCheckErrorKey = @"Error";
 
 NSString *KSRegistrationStartUpdateNotification =
     @"KSRegistrationStartUpdateNotification";
 NSString *KSUpdateCheckSuccessfulKey = @"CheckSuccessful";
 NSString *KSUpdateCheckSuccessfullyInstalledKey = @"SuccessfullyInstalled";
 
 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
@@ skipping 207 matching lines @@
   [self updateStatus:kAutoupdateChecking version:nil];
 
   [registration_ checkForUpdate];
 
   // Upon completion, KSRegistrationCheckForUpdateNotification will be posted,
   // and -checkForUpdateComplete: will be called.
 }
 
 - (void)checkForUpdateComplete:(NSNotification*)notification {
   NSDictionary* userInfo = [notification userInfo];
-  BOOL updatesAvailable =
-      [[userInfo objectForKey:KSRegistrationStatusKey] boolValue];
 
-  if (updatesAvailable) {
+  if ([[userInfo objectForKey:KSRegistrationUpdateCheckErrorKey] boolValue]) {
+    [self updateStatus:kAutoupdateCheckFailed version:nil];
+  } else if ([[userInfo objectForKey:KSRegistrationStatusKey] boolValue]) {
     // If an update is known to be available, go straight to
     // -updateStatus:version:.  It doesn't matter what's currently on disk.
     NSString* version = [userInfo objectForKey:KSRegistrationVersionKey];
     [self updateStatus:kAutoupdateAvailable version:version];
   } else {
     // If no updates are available, check what's on disk, because an update
     // may have already been installed.  This check happens on another thread,
     // and -updateStatus:version: will be called on the main thread when done.
     [self determineUpdateStatusAsync];
   }
@@ skipping 10 matching lines @@
   [self updateStatus:kAutoupdateInstalling version:nil];
 
   [registration_ startUpdate];
 
   // Upon completion, KSRegistrationStartUpdateNotification will be posted,
   // and -installUpdateComplete: will be called.
 }
 
 - (void)installUpdateComplete:(NSNotification*)notification {
   NSDictionary* userInfo = [notification userInfo];
-  BOOL checkSuccessful =
-      [[userInfo objectForKey:KSUpdateCheckSuccessfulKey] boolValue];
-  int installs =
-      [[userInfo objectForKey:KSUpdateCheckSuccessfullyInstalledKey] intValue];
 
-  if (!checkSuccessful || !installs) {
+  if (![[userInfo objectForKey:KSUpdateCheckSuccessfulKey] boolValue] ||
+      ![[userInfo objectForKey:KSUpdateCheckSuccessfullyInstalledKey]
+          intValue]) {
     [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];
   }
 }
 
@@ skipping 89 matching lines @@
   return static_cast<AutoupdateStatus>(
       [[dictionary objectForKey:kAutoupdateStatusStatus] intValue]);
 }
 
 - (BOOL)asyncOperationPending {
   AutoupdateStatus status = [self recentStatus];
   return status == kAutoupdateChecking || status == kAutoupdateInstalling;
 }
 
 @end  // @implementation KeystoneGlue