Add tests for the XPC client.

chrome/browser/notifications/notification_platform_bridge_mac.mm

 // Copyright 2015 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/notifications/notification_platform_bridge_mac.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/nullable_string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/notifications/alert_dispatcher.h"
 #include "chrome/browser/notifications/native_notification_display_service.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_common.h"
 #include "chrome/browser/notifications/notification_display_service_factory.h"
 #include "chrome/browser/notifications/persistent_notification_delegate.h"
 #include "chrome/browser/notifications/platform_notification_service_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/cocoa/notifications/notification_builder_mac.h"
 #import "chrome/browser/ui/cocoa/notifications/notification_delivery.h"
@@ skipping 64 matching lines @@
   ProfileManager* profileManager = g_browser_process->profile_manager();
   DCHECK(profileManager);
 
   profileManager->LoadProfile(
       profile_id, incognito, base::Bind(&ProfileLoadedCallback, operation, type,
                                         origin, notification_id, button_index));
 }
 
 }  // namespace
 
-// static
-NotificationPlatformBridge* NotificationPlatformBridge::Create() {
-  return new NotificationPlatformBridgeMac(
-      [NSUserNotificationCenter defaultUserNotificationCenter]);
-}
-
 // A Cocoa class that represents the delegate of NSUserNotificationCenter and
 // can forward commands to C++.
 @interface NotificationCenterDelegate
     : NSObject<NSUserNotificationCenterDelegate> {
 }
 @end
 
 // Interface to communicate with the Alert XPC service.
-@interface NotificationRemoteDispatcher : NSObject
+@interface AlertDispatcherImpl : NSObject<AlertDispatcher>
+
+- (instancetype)init;
 
 // Deliver a notification to the XPC service to be displayed as an alert.
 - (void)dispatchNotification:(NSDictionary*)data;
 
 // Close a notification for a given |notificationId| and |profileId|.
 - (void)closeNotificationWithId:(NSString*)notificationId
                   withProfileId:(NSString*)profileId;
 
 // Close all notifications.
 - (void)closeAllNotifications;
 
 @end
 
 // /////////////////////////////////////////////////////////////////////////////
-
 NotificationPlatformBridgeMac::NotificationPlatformBridgeMac(
-    NSUserNotificationCenter* notification_center)
+    NSUserNotificationCenter* notification_center,
+    id<AlertDispatcher> alert_dispatcher)
     : delegate_([NotificationCenterDelegate alloc]),
       notification_center_(notification_center),
-#if BUILDFLAG(ENABLE_XPC_NOTIFICATIONS)
-      notification_remote_dispatcher_(
-          [[NotificationRemoteDispatcher alloc] init])
-#else
-      notification_remote_dispatcher_(nullptr)
-#endif  // ENABLE_XPC_NOTIFICATIONS
-{
+      alert_dispatcher_(alert_dispatcher) {
   [notification_center_ setDelegate:delegate_.get()];
 }
 
 NotificationPlatformBridgeMac::~NotificationPlatformBridgeMac() {
   [notification_center_ setDelegate:nil];
 
   // TODO(miguelg) do not remove banners if possible.
   [notification_center_ removeAllDeliveredNotifications];
 #if BUILDFLAG(ENABLE_XPC_NOTIFICATIONS)
-  [notification_remote_dispatcher_ closeAllNotifications];
+  [alert_dispatcher_ closeAllNotifications];
 #endif  // BUILDFLAG(ENABLE_XPC_NOTIFICATIONS)
 }
 
+// static
+NotificationPlatformBridge* NotificationPlatformBridge::Create() {
+#if BUILDFLAG(ENABLE_XPC_NOTIFICATIONS)
+  return new NotificationPlatformBridgeMac(
+      [NSUserNotificationCenter defaultUserNotificationCenter],
+      [[AlertDispatcherImpl alloc] init]);
+#else
+  return new NotificationPlatformBridgeMac(
+      [NSUserNotificationCenter defaultUserNotificationCenter], nil);
+#endif  // ENABLE_XPC_NOTIFICATIONS
+}
+
 void NotificationPlatformBridgeMac::Display(
     NotificationCommon::Type notification_type,
     const std::string& notification_id,
     const std::string& profile_id,
     bool incognito,
     const Notification& notification) {
   base::scoped_nsobject<NotificationBuilder> builder(
       [[NotificationBuilder alloc]
       initWithCloseLabel:l10n_util::GetNSString(IDS_NOTIFICATION_BUTTON_CLOSE)
             optionsLabel:l10n_util::GetNSString(IDS_NOTIFICATION_BUTTON_OPTIONS)
@@ skipping 55 matching lines @@
   [builder setProfileId:base::SysUTF8ToNSString(profile_id)];
   [builder setIncognito:incognito];
   [builder setNotificationType:[NSNumber numberWithInteger:notification_type]];
 
 #if BUILDFLAG(ENABLE_XPC_NOTIFICATIONS)
   // Send persistent notifications to the XPC service so they
   // can be displayed as alerts. Chrome itself can only display
   // banners.
   if (notification.never_timeout()) {
     NSDictionary* dict = [builder buildDictionary];
-    [notification_remote_dispatcher_ dispatchNotification:dict];
+    [alert_dispatcher_ dispatchNotification:dict];
   } else {
     NSUserNotification* toast = [builder buildUserNotification];
     [notification_center_ deliverNotification:toast];
   }
 #else
   NSUserNotification* toast = [builder buildUserNotification];
   [notification_center_ deliverNotification:toast];
 #endif  // ENABLE_XPC_NOTIFICATIONS
 }
 
@@ skipping 15 matching lines @@
         [persistent_profile_id isEqualToString:current_profile_id]) {
       [notification_center_ removeDeliveredNotification:toast];
       notification_removed = true;
       break;
     }
   }
 #if BUILDFLAG(ENABLE_XPC_NOTIFICATIONS)
   // If no banner existed with that ID try to see if there is an alert
   // in the xpc server.
   if (!notification_removed) {
-    [notification_remote_dispatcher_
-        closeNotificationWithId:candidate_id
-                  withProfileId:current_profile_id];
+    [alert_dispatcher_ closeNotificationWithId:candidate_id
+                                 withProfileId:current_profile_id];
   }
 #endif  // ENABLE_XPC_NOTIFICATIONS
 }
 
 bool NotificationPlatformBridgeMac::GetDisplayed(
     const std::string& profile_id,
     bool incognito,
     std::set<std::string>* notifications) const {
   DCHECK(notifications);
 
@@ skipping 136 matching lines @@
 }
 
 - (BOOL)userNotificationCenter:(NSUserNotificationCenter*)center
      shouldPresentNotification:(NSUserNotification*)nsNotification {
   // Always display notifications, regardless of whether the app is foreground.
   return YES;
 }
 
 @end
 
-@implementation NotificationRemoteDispatcher {
+@implementation AlertDispatcherImpl {
   // The connection to the XPC server in charge of delivering alerts.
   base::scoped_nsobject<NSXPCConnection> xpcConnection_;
 }
 
 - (instancetype)init {
   if ((self = [super init])) {
     xpcConnection_.reset([[NSXPCConnection alloc]
         initWithServiceName:
             [NSString
                 stringWithFormat:notification_constants::kAlertXPCServiceName,
@@ skipping 37 matching lines @@
   [[xpcConnection_ remoteObjectProxy] closeAllNotifications];
 }
 
 // NotificationReply implementation
 - (void)notificationClick:(NSDictionary*)notificationResponseData {
   NotificationPlatformBridgeMac::ProcessNotificationResponse(
       notificationResponseData);
 }
 
 @end