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

chrome/browser/notifications/platform_notification_service_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_NOTIFICATIONS_PLATFORM_NOTIFICATION_SERVICE_IMPL_H_
 #define CHROME_BROWSER_NOTIFICATIONS_PLATFORM_NOTIFICATION_SERVICE_IMPL_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string16.h"
@@ skipping 34 matching lines @@
   blink::WebNotificationPermission CheckPermission(
       content::ResourceContext* resource_context,
       const GURL& origin,
       int render_process_id) override;
   void DisplayNotification(
       content::BrowserContext* browser_context,
       const GURL& origin,
       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;
 
  private:
   friend struct DefaultSingletonTraits<PlatformNotificationServiceImpl>;
   friend class PlatformNotificationServiceBrowserTest;
   friend class PlatformNotificationServiceTest;
   FRIEND_TEST_ALL_PREFIXES(
       PlatformNotificationServiceTest, DisplayNameForOrigin);
+  FRIEND_TEST_ALL_PREFIXES(PlatformNotificationServiceTest,
+                           TestWebOriginDisplayName);
 
   PlatformNotificationServiceImpl();
   ~PlatformNotificationServiceImpl() override;
 
   // Creates a new Web Notification-based Notification object.
   // TODO(peter): |delegate| can be a scoped_refptr, but properly passing this
   // through requires changing a whole lot of Notification constructor calls.
   Notification CreateNotificationFromData(
       Profile* profile,
       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.
+  static base::string16 WebOriginDisplayName(const GURL& origin,

[Peter Beverloo, 2015/01/14 19:18:14]

nit: TODO for future consolidation?

[dewittj, 2015/01/15 22:31:35]

Done.

+                                             const std::string& languages);
 
   // Weak reference. Ownership maintains with the test.
   NotificationUIManager* notification_ui_manager_for_tests_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformNotificationServiceImpl);
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_PLATFORM_NOTIFICATION_SERVICE_IMPL_H_