Bulletproof download status update code.

chrome/browser/download/download_status_updater_mac.mm

 // Copyright (c) 2012 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/download/download_status_updater.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/supports_user_data.h"
 #include "base/sys_string_conversions.h"
@@ skipping 57 matching lines @@
   if (!result) {
     NSString** ref = static_cast<NSString**>(
         CFBundleGetDataPointerForName(foundation,
                                       base::mac::NSToCFCast(string)));
     if (ref) {
       result = *ref;
       [cache setObject:result forKey:string];
     }
   }
 
+  if (!result) {
+    // Huh. At least return a local copy of the expected string.
+    result = string;
+    if ([result hasSuffix:@"Key"])
+      result = [result substringToIndex:[result length] - 3];

[Robert Sesek, 2012/08/16 15:30:29]

Pull @"Key" into a local so you don't have to count this manually.

[Avi (use Gerrit), 2012/08/16 15:41:42]

Done.

+  }
+
   return result;
 }
 
 }  // namespace
 
 @interface NSProgress : NSObject
 
 - (id)initWithParent:(id)parent userInfo:(NSDictionary*)info;
 @property(copy) NSString* kind;
 
@@ skipping 80 matching lines @@
                    float progress) {
   DockIcon* dock_icon = [DockIcon sharedDockIcon];
   [dock_icon setDownloads:download_count];
   [dock_icon setIndeterminate:!progress_known];
   [dock_icon setProgress:progress];
   [dock_icon updateIcon];
 }
 
 void CreateNSProgress(content::DownloadItem* download) {
   NSURL* source_url = [NSURL URLWithString:
-      base::SysUTF8ToNSString(download->GetURL().spec())];
+      base::SysUTF8ToNSString(download->GetURL().possibly_invalid_spec())];
   FilePath destination_path = download->GetFullPath();
   NSURL* destination_url = [NSURL fileURLWithPath:
       base::mac::FilePathToNSString(destination_path)];
 
   // If there were an image to fly to the download folder in the dock, then
   // the keys in the userInfo to set would be:
   // - @"NSProgressFlyToImageKey" : NSImage
   // - kNSProgressFileIconOriginalRectKey : NSValue of NSRect in global coords
 
   NSDictionary* user_info = @{
-    ProgressString(kNSProgressFileDownloadingSourceURLKey) : source_url,
     ProgressString(kNSProgressFileLocationCanChangeKey) : @true,
     ProgressString(kNSProgressFileOperationKindKey) :
       ProgressString(kNSProgressFileOperationKindDownloading),

[Robert Sesek, 2012/08/16 15:30:29]

nit: this should be indented 2 more

[Avi (use Gerrit), 2012/08/16 15:41:42]

Done.

     ProgressString(kNSProgressFileURLKey) : destination_url
   };
+
   Class progress_class = NSClassFromString(@"NSProgress");
   NSProgress* progress = [progress_class performSelector:@selector(alloc)];
   progress = [progress performSelector:@selector(initWithParent:userInfo:)
                             withObject:nil
                             withObject:user_info];
   progress.kind = ProgressString(kNSProgressKindFile);
 
+  if (source_url) {
+    [progress setUserInfoObject:source_url forKey:
+        ProgressString(kNSProgressFileDownloadingSourceURLKey)];
+  }
+
   progress.pausable = NO;
   progress.cancellable = YES;
   [progress setCancellationHandler:^{
       dispatch_async(dispatch_get_main_queue(), ^{
           download->Cancel(true);
       });
   }];
 
   progress.totalUnitCount = download->GetTotalBytes();
   progress.completedUnitCount = download->GetReceivedBytes();
@@ skipping 66 matching lines @@
     }
 
     // Notify the Finder.
     NSString* parent_path = [download_path stringByDeletingLastPathComponent];
     FNNotifyByPath(
         reinterpret_cast<const UInt8*>([parent_path fileSystemRepresentation]),
         kFNDirectoryModifiedMessage,
         kNilOptions);
   }
 }