Make //content responsible for generating notification Ids

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>
@@ skipping 32 matching lines @@
 class PlatformNotificationServiceImpl
     : public content::PlatformNotificationService {
  public:
   // Returns the active instance of the service in the browser process. Safe to
   // be called from any thread.
   static PlatformNotificationServiceImpl* GetInstance();
 
   // To be called when a persistent notification has been clicked on. The
   // Service Worker associated with the registration will be started if
   // needed, on which the event will be fired. Must be called on the UI thread.
-  void OnPersistentNotificationClick(
-      content::BrowserContext* browser_context,
-      int64_t persistent_notification_id,
-      const GURL& origin,
-      int action_index);
+  void OnPersistentNotificationClick(content::BrowserContext* browser_context,
+                                     const std::string& notification_id,
+                                     const GURL& origin,
+                                     int action_index);
 
   // To be called when a persistent notification has been closed. The data
   // associated with the notification has to be pruned from the database in this
   // case, to make sure that it continues to be in sync. Must be called on the
   // UI thread.
   void OnPersistentNotificationClose(content::BrowserContext* browser_context,
-                                     int64_t persistent_notification_id,
+                                     const std::string& notification_id,
                                      const GURL& origin,
                                      bool by_user);
 
   // content::PlatformNotificationService implementation.
   blink::mojom::PermissionStatus CheckPermissionOnUIThread(
       content::BrowserContext* browser_context,
       const GURL& origin,
       int render_process_id) override;
   blink::mojom::PermissionStatus CheckPermissionOnIOThread(
       content::ResourceContext* resource_context,
       const GURL& origin,
       int render_process_id) override;
   void DisplayNotification(
       content::BrowserContext* browser_context,
+      const std::string& notification_id,
       const GURL& origin,
       const content::PlatformNotificationData& notification_data,
       const content::NotificationResources& notification_resources,
       std::unique_ptr<content::DesktopNotificationDelegate> delegate,
       base::Closure* cancel_callback) override;
   void DisplayPersistentNotification(
       content::BrowserContext* browser_context,
-      int64_t persistent_notification_id,
+      const std::string& notification_id,
       const GURL& service_worker_scope,
       const GURL& origin,
       const content::PlatformNotificationData& notification_data,
       const content::NotificationResources& notification_resources) override;
-  void ClosePersistentNotification(
-      content::BrowserContext* browser_context,
-      int64_t persistent_notification_id) override;
+  void ClosePersistentNotification(content::BrowserContext* browser_context,
+                                   const std::string& notification_id) override;
   bool GetDisplayedPersistentNotifications(
       content::BrowserContext* browser_context,
       std::set<std::string>* displayed_notifications) override;
 
  private:
   friend struct base::DefaultSingletonTraits<PlatformNotificationServiceImpl>;
   friend class PlatformNotificationServiceBrowserTest;
   friend class PlatformNotificationServiceTest;
   friend class PushMessagingBrowserTest;
   FRIEND_TEST_ALL_PREFIXES(PlatformNotificationServiceTest,
@@ skipping 38 matching lines @@
 #if BUILDFLAG(ENABLE_BACKGROUND)
   // Makes sure we keep the browser alive while the event in being processed.
   // As we have no control on the click handling, the notification could be
   // closed before a browser is brought up, thus terminating Chrome if it was
   // the last KeepAlive. (see https://crbug.com/612815)
   std::unique_ptr<ScopedKeepAlive> click_dispatch_keep_alive_;
 
   int pending_click_dispatch_events_;
 #endif
 
-  // 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_;
-
   // Tracks the id of persistent notifications that have been closed
   // programmatically to avoid dispatching close events for them.
-  std::unordered_set<int64_t> closed_notifications_;
+  std::unordered_set<std::string> closed_notifications_;
 
   // Only set and used for tests, owned by the caller in that case.
   NotificationDisplayService* test_display_service_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformNotificationServiceImpl);
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_PLATFORM_NOTIFICATION_SERVICE_IMPL_H_