Display ETLD+1 instead of the full domain in MacOSX native notifications

chrome/browser/notifications/notification_platform_bridge_mac_unittest.mm

 // Copyright 2016 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 <AppKit/AppKit.h>
 #import <objc/runtime.h>
 
 #include "base/bind.h"
 #include "base/i18n/number_formatting.h"
 #include "base/mac/scoped_nsobject.h"
@@ skipping 29 matching lines @@
     [alert_dispatcher_ closeAllNotifications];
   }
 
  protected:
   NSUserNotification* BuildNotification() {
     base::scoped_nsobject<NotificationBuilder> builder(
         [[NotificationBuilder alloc] initWithCloseLabel:@"Close"
                                            optionsLabel:@"More"
                                           settingsLabel:@"Settings"]);
     [builder setTitle:@"Title"];
-    [builder setSubTitle:@"https://www.miguel.com"];
     [builder setOrigin:@"https://www.miguel.com/"];
     [builder setContextMessage:@""];
     [builder setButtons:@"Button1" secondaryButton:@"Button2"];
     [builder setTag:@"tag1"];
     [builder setIcon:[NSImage imageNamed:@"NSApplicationIcon"]];
     [builder setNotificationId:@"notification_id"];
     [builder setProfileId:@"profile_id"];
     [builder setIncognito:false];
     [builder setNotificationType:@(NotificationCommon::PERSISTENT)];
     [builder setShowSettingsButton:true];
@@ skipping 28 matching lines @@
                               true /* require_interaction */);
   }
 
   std::unique_ptr<Notification> CreateNotification(const char* title,
                                                    const char* subtitle,
                                                    const char* origin,
                                                    const char* button1,
                                                    const char* button2,
                                                    bool require_interaction) {
     message_center::RichNotificationData optional_fields;
-    optional_fields.context_message = base::UTF8ToUTF16(origin);
     if (button1) {
       optional_fields.buttons.push_back(
           message_center::ButtonInfo(base::UTF8ToUTF16(button1)));
       if (button2) {
         optional_fields.buttons.push_back(
             message_center::ButtonInfo(base::UTF8ToUTF16(button2)));
       }
     }
 
     GURL url = GURL(origin);
@@ skipping 102 matching lines @@
                                         alert_dispatcher()));
   bridge->Display(NotificationCommon::PERSISTENT, "notification_id",
                   "profile_id", false, *notification);
   NSArray* notifications = [notification_center() deliveredNotifications];
 
   EXPECT_EQ(1u, [notifications count]);
 
   NSUserNotification* delivered_notification = [notifications objectAtIndex:0];
   EXPECT_NSEQ(@"Title", [delivered_notification title]);
   EXPECT_NSEQ(@"Context", [delivered_notification informativeText]);
-  EXPECT_NSEQ(@"https://gmail.com", [delivered_notification subtitle]);
+  EXPECT_NSEQ(@"gmail.com", [delivered_notification subtitle]);
   EXPECT_NSEQ(@"Close", [delivered_notification otherButtonTitle]);
   EXPECT_NSEQ(@"Settings", [delivered_notification actionButtonTitle]);
 }
 
 TEST_F(NotificationPlatformBridgeMacTest, TestDisplayOneButton) {
   std::unique_ptr<Notification> notification = CreateBanner(
       "Title", "Context", "https://gmail.com", "Button 1", nullptr);
 
   std::unique_ptr<NotificationPlatformBridgeMac> bridge(
       new NotificationPlatformBridgeMac(notification_center(),
                                         alert_dispatcher()));
   bridge->Display(NotificationCommon::PERSISTENT, "notification_id",
                   "profile_id", false, *notification);
 
   NSArray* notifications = [notification_center() deliveredNotifications];
   EXPECT_EQ(1u, [notifications count]);
   NSUserNotification* delivered_notification = [notifications objectAtIndex:0];
   EXPECT_NSEQ(@"Title", [delivered_notification title]);
   EXPECT_NSEQ(@"Context", [delivered_notification informativeText]);
-  EXPECT_NSEQ(@"https://gmail.com", [delivered_notification subtitle]);
+  EXPECT_NSEQ(@"gmail.com", [delivered_notification subtitle]);
   EXPECT_NSEQ(@"Close", [delivered_notification otherButtonTitle]);
   EXPECT_NSEQ(@"More", [delivered_notification actionButtonTitle]);
 }
 
 TEST_F(NotificationPlatformBridgeMacTest, TestDisplayProgress) {
   std::unique_ptr<Notification> notification =
       CreateBanner("Title", "Context", "https://gmail.com", nullptr, nullptr);
   const int kSamplePercent = 10;
 
   notification->set_progress(kSamplePercent);
@@ skipping 162 matching lines @@
     bridge->Display(NotificationCommon::PERSISTENT, "notification_id2",
                     "profile_id", false, *alert);
     EXPECT_EQ(1u, [[notification_center() deliveredNotifications] count]);
     EXPECT_EQ(1u, [[alert_dispatcher() alerts] count]);
   }
 
   // The destructor of the bridge should close all notifications.
   EXPECT_EQ(0u, [[notification_center() deliveredNotifications] count]);
   EXPECT_EQ(0u, [[alert_dispatcher() alerts] count]);
 }
+
+TEST_F(NotificationPlatformBridgeMacTest, TestDisplayETLDPlusOne) {
+  std::unique_ptr<Notification> notification =
+      CreateBanner("Title", "Context", "https://hello.world.test.co.uk",
+                   "Button 1", nullptr);
+
+  std::unique_ptr<NotificationPlatformBridgeMac> bridge(
+      new NotificationPlatformBridgeMac(notification_center(),
+                                        alert_dispatcher()));
+  bridge->Display(NotificationCommon::PERSISTENT, "notification_id1",
+                  "profile_id", false, *notification);
+
+  notification = CreateBanner("Title", "Context", "https://mail.appspot.com",
+                              "Button 1", nullptr);
+
+  bridge->Display(NotificationCommon::PERSISTENT, "notification_id2",
+                  "profile_id", false, *notification);
+  notification = CreateBanner("Title", "Context", "https://tests.peter.sh",
+                              "Button 1", nullptr);
+
+  bridge->Display(NotificationCommon::PERSISTENT, "notification_id3",
+                  "profile_id", false, *notification);
+
+  notification = CreateBanner("Title", "Context", "http://localhost:8080",
+                              "Button 1", nullptr);
+
+  bridge->Display(NotificationCommon::PERSISTENT, "notification_id4",
+                  "profile_id", false, *notification);
+
+  notification = CreateBanner("Title", "Context", "https://93.186.186.172",
+                              "Button 1", nullptr);
+
+  bridge->Display(NotificationCommon::PERSISTENT, "notification_id5",
+                  "profile_id", false, *notification);
+
+  NSArray* notifications = [notification_center() deliveredNotifications];
+  EXPECT_EQ(5u, [notifications count]);
+  NSUserNotification* delivered_notification = [notifications objectAtIndex:0];
+  EXPECT_NSEQ(@"test.co.uk", [delivered_notification subtitle]);
+  delivered_notification = [notifications objectAtIndex:1];
+  EXPECT_NSEQ(@"mail.appspot.com", [delivered_notification subtitle]);
+  delivered_notification = [notifications objectAtIndex:2];
+  EXPECT_NSEQ(@"peter.sh", [delivered_notification subtitle]);
+  delivered_notification = [notifications objectAtIndex:3];
+  EXPECT_NSEQ(@"localhost:8080", [delivered_notification subtitle]);
+  delivered_notification = [notifications objectAtIndex:4];
+  EXPECT_NSEQ(@"93.186.186.172", [delivered_notification subtitle]);
+}