Elide origins displayed on 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 <stdint.h>
 #include <map>
 #include <set>
@@ skipping 72 matching lines @@
       int64_t persistent_notification_id) override;
   bool GetDisplayedPersistentNotifications(
       content::BrowserContext* browser_context,
       std::set<std::string>* displayed_notifications) override;
 
  private:
   friend struct DefaultSingletonTraits<PlatformNotificationServiceImpl>;
   friend class PlatformNotificationServiceBrowserTest;
   friend class PlatformNotificationServiceTest;
   friend class PushMessagingBrowserTest;
+  FRIEND_TEST_ALL_PREFIXES(PlatformNotificationServiceTest,
+                           CreateNotificationFromData);
   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) 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, 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);
+  std::string DisplayNameForOrigin(Profile* profile, const GURL& origin) const;
 
   // Weak reference. Ownership maintains with the test.
   NotificationUIManager* notification_ui_manager_for_tests_;
 
   // Mapping between a persistent notification id and the id of the associated
   // message_center::Notification object. Must only be used on the UI thread.
   std::map<int64_t, std::string> persistent_notifications_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformNotificationServiceImpl);
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_PLATFORM_NOTIFICATION_SERVICE_IMPL_H_