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

chrome/browser/notifications/platform_notification_service_impl.h

Index: chrome/browser/notifications/platform_notification_service_impl.h
diff --git a/chrome/browser/notifications/platform_notification_service_impl.h b/chrome/browser/notifications/platform_notification_service_impl.h
index 24bf4d964ca620d70ac99a519bac9c8ba0051edc..0460fc53e6fbb26db36ce3222ff992383f2fdcfc 100644
--- a/chrome/browser/notifications/platform_notification_service_impl.h
+++ b/chrome/browser/notifications/platform_notification_service_impl.h
@@ -56,15 +56,13 @@ class PlatformNotificationServiceImpl
       const SkBitmap& icon,
       const content::PlatformNotificationData& notification_data,
       scoped_ptr<content::DesktopNotificationDelegate> delegate,
-      int render_process_id,
       base::Closure* cancel_callback) override;
   void DisplayPersistentNotification(
       content::BrowserContext* browser_context,
       int64 service_worker_registration_id,
       const GURL& origin,
       const SkBitmap& icon,
-      const content::PlatformNotificationData& notification_data,
-      int render_process_id) override;
+      const content::PlatformNotificationData& notification_data) override;
   void ClosePersistentNotification(
       content::BrowserContext* browser_context,
       const std::string& persistent_notification_id) override;
@@ -76,6 +74,8 @@ class PlatformNotificationServiceImpl
   friend class gcm::PushMessagingBrowserTest;
   FRIEND_TEST_ALL_PREFIXES(
       PlatformNotificationServiceTest, DisplayNameForOrigin);
+  FRIEND_TEST_ALL_PREFIXES(PlatformNotificationServiceTest,
+                           TestWebOriginDisplayName);
 
   PlatformNotificationServiceImpl();
   ~PlatformNotificationServiceImpl() override;
@@ -88,19 +88,24 @@ class PlatformNotificationServiceImpl
       const GURL& origin,
       const SkBitmap& icon,
       const content::PlatformNotificationData& notification_data,
-      NotificationDelegate* delegate,
-      int render_process_id) const;
+      NotificationDelegate* delegate) const;
 
   // Overrides the Notification UI Manager to use to |manager|. Only to be
   // used by tests. Tests are responsible for cleaning up after themselves.
   void SetNotificationUIManagerForTesting(NotificationUIManager* manager);
 
-  // Returns a display name for an origin in the process id, to be used in
-  // permission infobar or on the frame of the notification toast. Different
-  // from the origin itself when dealing with extensions.
-  base::string16 DisplayNameForOriginInProcessId(Profile* profile,
-                                                 const GURL& origin,
-                                                 int process_id) const;
+  // Returns a display name for an origin, to be used in permission infobar or
+  // on the frame of the notification toast. Different from the origin itself
+  // when dealing with extensions.
+  base::string16 DisplayNameForOrigin(Profile* profile,
+                                      const GURL& origin) const;
+
+  // Translates a URL into a slightly more readable version that may omit
+  // the port and scheme for common cases.
+  // TODO(dewittj): Remove this when the proper function is implemented in a
+  // chrome/browser/ui library function.  See crbug.com/402698.
+  static base::string16 WebOriginDisplayName(const GURL& origin,
+                                             const std::string& languages);
 
   // Weak reference. Ownership maintains with the test.
   NotificationUIManager* notification_ui_manager_for_tests_;