Make //content responsible for generating notification Ids

chrome/browser/push_messaging/push_messaging_notification_manager.cc

 // Copyright 2015 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 "chrome/browser/push_messaging/push_messaging_notification_manager.h"
 
 #include <stddef.h>
 
 #include <bitset>
 
@@ skipping 153 matching lines @@
   }
 
   // If more than one notification is showing for this Service Worker, close
   // the default notification if it happens to be part of this group.
   if (notification_count >= 2) {
     for (const auto& notification_database_data : data) {
       if (notification_database_data.notification_data.tag !=
           kPushMessagingForcedNotificationTag)
         continue;
 
+      scoped_refptr<PlatformNotificationContext> notification_context =
+          GetStoragePartition(profile_, origin)
+              ->GetPlatformNotificationContext();
+
+      const std::string notification_id =
+          notification_context->GenerateNotificationId(
+              origin, kPushMessagingForcedNotificationTag,
+              notification_database_data.notification_id);
+
       PlatformNotificationServiceImpl* platform_notification_service =
           PlatformNotificationServiceImpl::GetInstance();
 
       // First close the notification for the user's point of view, and then
       // manually tell the service that the notification has been closed in
       // order to avoid duplicating the thread-jump logic.
       platform_notification_service->ClosePersistentNotification(
-          profile_, notification_database_data.notification_id);
+          profile_, notification_id);
       platform_notification_service->OnPersistentNotificationClose(
-          profile_, notification_database_data.notification_id,
-          notification_database_data.origin, false /* by_user */);
+          profile_, notification_id, notification_database_data.origin,
+          false /* by_user */);
 
       break;
     }
   }
 
   // Get the budget for the origin.
   BudgetManager* manager = BudgetManagerFactory::GetForProfile(profile_);
   manager->GetBudget(
       origin,
       base::Bind(&PushMessagingNotificationManager::DidGetBudget,
@@ skipping 126 matching lines @@
                             message_handled_closure)));
 }
 
 // static
 void PushMessagingNotificationManager::DidWriteNotificationDataIOProxy(
     const base::WeakPtr<PushMessagingNotificationManager>& ui_weak_ptr,
     const GURL& origin,
     const PlatformNotificationData& notification_data,
     const base::Closure& message_handled_closure,
     bool success,
-    int64_t persistent_notification_id) {
+    const std::string& notification_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&PushMessagingNotificationManager::DidWriteNotificationData,
                  ui_weak_ptr, origin, notification_data,
-                 message_handled_closure, success, persistent_notification_id));
+                 message_handled_closure, success, notification_id));
 }
 
 void PushMessagingNotificationManager::DidWriteNotificationData(
     const GURL& origin,
     const PlatformNotificationData& notification_data,
     const base::Closure& message_handled_closure,
     bool success,
-    int64_t persistent_notification_id) {
+    const std::string& notification_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!success) {
     DLOG(ERROR) << "Writing forced notification to database should not fail";
     message_handled_closure.Run();
     return;
   }
 
   // Do not pass service worker scope. The origin will be used instead of the
   // service worker scope to determine whether a notification should be
   // attributed to a WebAPK on Android. This is OK because this code path is hit
   // rarely.
   PlatformNotificationServiceImpl::GetInstance()->DisplayPersistentNotification(
-      profile_, persistent_notification_id, GURL() /* service_worker_scope */,
-      origin, notification_data, NotificationResources());
+      profile_, notification_id, GURL() /* service_worker_scope */, origin,
+      notification_data, NotificationResources());
 
   message_handled_closure.Run();
 }