Transfer the notification icon through XPC as NSData for OSX 10.09

This is because NSImage only started conforming to NSecureCoding in 10.10

BUG=696759

Review-Url: https://codereview.chromium.org/2728173003
Cr-Commit-Position: refs/heads/master@{#454916}
(cherry picked from commit 52f904d)

Review-Url: https://codereview.chromium.org/2736223002 .
Cr-Commit-Position: refs/branch-heads/3029@{#62}
Cr-Branched-From: 939b32e-refs/heads/master@{#454471}

Author: miguelgarciaarribas

chrome/browser/ui/cocoa/notifications/notification_builder_mac.mm

@@ -6,7 +6,9 @@
 
 #import <AppKit/AppKit.h>
 
+#include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
+
 #include "chrome/browser/ui/cocoa/notifications/notification_constants_mac.h"
 
 namespace {
@@ -68,8 +70,14 @@ - (void)setContextMessage:(NSString*)contextMessage {
 }
 
 - (void)setIcon:(NSImage*)icon {
-  if (icon)
-    [notificationData_ setObject:icon forKey:kNotificationImage];
+  if (icon) {
+    if ([icon conformsToProtocol:@protocol(NSSecureCoding)]) {
+      [notificationData_ setObject:icon forKey:kNotificationImage];
+    } else {  // NSImage only conforms to NSSecureCoding from 10.10 onwards.
+      [notificationData_ setObject:[icon TIFFRepresentation]
+                            forKey:kNotificationImage];
+    }
+  }
 }
 
 - (void)setButtons:(NSString*)primaryButton
@@ -125,8 +133,14 @@ - (NSUserNotification*)buildUserNotification {
   // Icon
   if ([notificationData_ objectForKey:kNotificationImage]) {
     if ([toast respondsToSelector:@selector(_identityImage)]) {
-      NSImage* image = [notificationData_ objectForKey:kNotificationImage];
-      [toast setValue:image forKey:@"_identityImage"];
+      if ([[NSImage class] conformsToProtocol:@protocol(NSSecureCoding)]) {
+        NSImage* image = [notificationData_ objectForKey:kNotificationImage];
+        [toast setValue:image forKey:@"_identityImage"];
+      } else {  // NSImage only conforms to NSSecureCoding from 10.10 onwards.
+        base::scoped_nsobject<NSImage> image([[NSImage alloc]
+            initWithData:[notificationData_ objectForKey:kNotificationImage]]);
+        [toast setValue:image forKey:@"_identityImage"];
+      }
       [toast setValue:@NO forKey:@"_identityImageHasBorder"];
     }
   }

chrome/browser/ui/cocoa/notifications/notification_service_delegate.mm

@@ -38,9 +38,9 @@ - (BOOL)listener:(NSXPCListener*)listener
   newConnection.exportedInterface =
       [NSXPCInterface interfaceWithProtocol:@protocol(NotificationDelivery)];
   [newConnection.exportedInterface
-         setClasses:[NSSet setWithObjects:[NSDictionary class], [NSImage class],
-                                          [NSNumber class], [NSString class],
-                                          nil]
+         setClasses:[NSSet setWithObjects:[NSData class], [NSDictionary class],
+                                          [NSImage class], [NSNumber class],
+                                          [NSString class], nil]
         forSelector:@selector(deliverNotification:)
       argumentIndex:0
             ofReply:NO];