Make //content responsible for generating notification Ids

third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp

 // 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.
 
 #include "modules/notifications/ServiceWorkerRegistrationNotifications.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/ExecutionContext.h"
@@ skipping 20 matching lines @@
 // Allows using a CallbackPromiseAdapter with a WebVector to resolve the
 // getNotifications() promise with a HeapVector owning Notifications.
 class NotificationArray {
 public:
     using WebType = const WebVector<WebPersistentNotificationInfo>&;
 
     static HeapVector<Member<Notification>> take(ScriptPromiseResolver* resolver, const WebVector<WebPersistentNotificationInfo>& notificationInfos)
     {
         HeapVector<Member<Notification>> notifications;
         for (const WebPersistentNotificationInfo& notificationInfo : notificationInfos)
-            notifications.append(Notification::create(resolver->getExecutionContext(), notificationInfo.persistentId, notificationInfo.data, true /* showing */));
+            notifications.append(Notification::create(resolver->getExecutionContext(), notificationInfo.notificationId, notificationInfo.data, true /* showing */));
 
         return notifications;
     }
 
 private:
     NotificationArray() = delete;
 };
 
 } // namespace
 
@@ skipping 88 matching lines @@
     DCHECK(m_loaders.contains(loader));
 
     WebNotificationManager* notificationManager = Platform::current()->notificationManager();
     DCHECK(notificationManager);
 
     notificationManager->showPersistent(WebSecurityOrigin(origin.get()), data, loader->getResources(), m_registration->webRegistration(), callbacks.release());
     m_loaders.remove(loader);
 }
 
 } // namespace blink