Adds a context message of the security origin for web notifications.

chrome/browser/notifications/platform_notification_service_unittest.cc

 // Copyright 2014 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 "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "chrome/browser/notifications/notification_test_util.h"
 #include "chrome/browser/notifications/platform_notification_service_impl.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 172 matching lines @@
       service()->DisplayNameForOriginInProcessId(profile(),
                                                  GURL("https://chrome.com/"),
                                                  0 /* render_process_id */);
 
   EXPECT_EQ(base::ASCIIToUTF16("chrome.com"), display_name);
 
   // TODO(peter): Include unit tests for the extension-name translation
   // functionality of DisplayNameForOriginInProcessId.
 }
 
+TEST_F(PlatformNotificationServiceTest, TestOriginDisplayName) {
+  std::string language("en-us");
+
+  GURL https_origin("https://mail.google.com/");
+  base::string16 expected_display_name = base::ASCIIToUTF16("mail.google.com");
+  EXPECT_EQ(expected_display_name,
+            PlatformNotificationServiceImpl::OriginDisplayName(https_origin,
+                                                               language));
+
+  GURL https_origin_standard_port("https://mail.google.com:443/");
+  expected_display_name = base::ASCIIToUTF16("mail.google.com");
+  EXPECT_EQ(expected_display_name,
+            PlatformNotificationServiceImpl::OriginDisplayName(
+                https_origin_standard_port, language));
+
+  GURL https_origin_nonstandard_port("https://mail.google.com:444/");
+  expected_display_name = base::ASCIIToUTF16("mail.google.com:444");
+  EXPECT_EQ(expected_display_name,
+            PlatformNotificationServiceImpl::OriginDisplayName(
+                https_origin_nonstandard_port, language));
+
+  GURL http_origin("http://mail.google.com/");
+  expected_display_name = base::ASCIIToUTF16("mail.google.com");
+  EXPECT_EQ(expected_display_name,
+            PlatformNotificationServiceImpl::OriginDisplayName(http_origin,
+                                                               language));
+
+  GURL http_origin_standard_port("http://mail.google.com:80/");
+  expected_display_name = base::ASCIIToUTF16("mail.google.com");
+  EXPECT_EQ(expected_display_name,
+            PlatformNotificationServiceImpl::OriginDisplayName(
+                http_origin_standard_port, language));
+
+  GURL http_origin_nonstandard_port("http://mail.google.com:81/");
+  expected_display_name = base::ASCIIToUTF16("mail.google.com:81");
+  EXPECT_EQ(expected_display_name,
+            PlatformNotificationServiceImpl::OriginDisplayName(
+                http_origin_nonstandard_port, language));
+  // TODO(dewittj): Add file origin once it's supported.
+}
+
 TEST_F(PlatformNotificationServiceTest, NotificationPermissionLastUsage) {
   // Both page and persistent notifications should update the last usage
   // time of the notification permission for the origin.
   GURL origin("https://chrome.com/");
   base::Time begin_time;
 
   CreateSimplePageNotification();
 
   base::Time after_page_notification =
       profile()->GetHostContentSettingsMap()->GetLastUsage(
           origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
   EXPECT_GT(after_page_notification, begin_time);
 
   // Ensure that there is at least some time between the two calls.
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(1));
 
   service()->DisplayPersistentNotification(profile(),
                                            42 /* sw_registration_id */,
                                            origin,
                                            SkBitmap(),
                                            content::PlatformNotificationData(),
                                            0 /* render_process_id */);
 
   base::Time after_persistent_notification =
       profile()->GetHostContentSettingsMap()->GetLastUsage(
           origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
   EXPECT_GT(after_persistent_notification, after_page_notification);
 }