Make //content responsible for generating notification Ids

content/browser/notifications/notification_database.h

 // 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.
 
 #ifndef CONTENT_BROWSER_NOTIFICATIONS_NOTIFICATION_DATABASE_H_
 #define CONTENT_BROWSER_NOTIFICATIONS_NOTIFICATION_DATABASE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 61 matching lines @@
   explicit NotificationDatabase(const base::FilePath& path);
   ~NotificationDatabase();
 
   // Opens the database. If |path| is non-empty, it will be created on the given
   // directory on the filesystem. If |path| is empty, the database will be
   // created in memory instead, and its lifetime will be tied to this instance.
   // |create_if_missing| determines whether to create the database if necessary.
   Status Open(bool create_if_missing);
 
   // Reads the notification data for the notification identified by
-  // |notification_id| and belonging to |origin| from the database, and stores
-  // it in |notification_database_data|. Returns the status code.
+  // |persistent_notification_id| and belonging to |origin| from the database,
+  // and stores it in |notification_database_data|. Returns the status code.
   Status ReadNotificationData(
-      int64_t notification_id,
+      int64_t persistent_notification_id,
       const GURL& origin,
       NotificationDatabaseData* notification_database_data) const;
 
   // Reads all notification data for all origins from the database, and appends
   // the data to |notification_data_vector|. Returns the status code.
   Status ReadAllNotificationData(
       std::vector<NotificationDatabaseData>* notification_data_vector) const;
 
   // Reads all notification data associated with |origin| from the database, and
   // appends the data to |notification_data_vector|. Returns the status code.
   Status ReadAllNotificationDataForOrigin(
       const GURL& origin,
       std::vector<NotificationDatabaseData>* notification_data_vector) const;
 
   // Reads all notification data associated to |service_worker_registration_id|
   // belonging to |origin| from the database, and appends the data to the
   // |notification_data_vector|. Returns the status code.
   Status ReadAllNotificationDataForServiceWorkerRegistration(
       const GURL& origin,
       int64_t service_worker_registration_id,
       std::vector<NotificationDatabaseData>* notification_data_vector) const;
 
   // Writes the |notification_database_data| for a new notification belonging to
   // |origin| to the database, and returns the status code of the writing
-  // operation. The id of the new notification will be set in |notification_id|.
+  // operation. The id of the new notification will be written to
+  // |persistent_notification_id|.
   Status WriteNotificationData(
       const GURL& origin,
       const NotificationDatabaseData& notification_database_data,
-      int64_t* notification_id);
+      int64_t* persistent_notification_id);
 
   // Deletes all data associated with the notification identified by
-  // |notification_id| belonging to |origin| from the database. Returns the
-  // status code of the deletion operation. Note that it is not considered a
-  // failure if the to-be-deleted notification does not exist.
-  Status DeleteNotificationData(int64_t notification_id, const GURL& origin);
+  // |persistent_notification_id| belonging to |origin| from the database.
+  // Returns the status code of the deletion operation. Note that it is not
+  // considered a failure if the to-be-deleted notification does not exist.
+  Status DeleteNotificationData(int64_t persistent_notification_id,
+                                const GURL& origin);
 
   // Deletes all data associated with |origin| from the database, optionally
   // filtered by the |tag|, and appends the deleted notification ids to
   // |deleted_notification_set|. Returns the status code of the deletion
   // operation.
   Status DeleteAllNotificationDataForOrigin(
       const GURL& origin,
       const std::string& tag,
       std::set<int64_t>* deleted_notification_set);
 
   // Deletes all data associated with the |service_worker_registration_id|
   // belonging to |origin| from the database, and appends the deleted
   // notification ids to |deleted_notification_set|. Returns the status code
   // of the deletion operation.
   Status DeleteAllNotificationDataForServiceWorkerRegistration(
       const GURL& origin,
       int64_t service_worker_registration_id,
       std::set<int64_t>* deleted_notification_set);
 
+  // Stores an association of |notification_id| to |persistent_notification_id|
+  // to the database. Returns the status code of the operation.
+  Status StoreIdAssociation(const std::string& notification_id,
+                            int64_t persistent_notification_id);
+
+  // Reads the |*persistent_notification_id| that is associated with the
+  // |notification_id|. Returns the status code of the operation.
+  Status ReadIdAssociation(const std::string& notification_id,
+                           int64_t* persistent_notification_id);
+
+  // Removes the association stored for the given |notification_id|.
+  Status DeleteIdAssociation(const std::string& notification_id);
+
   // Completely destroys the contents of this database.
   Status Destroy();
 
  private:
   friend class NotificationDatabaseTest;
 
   // TODO(peter): Convert to an enum class when DCHECK_EQ supports this.
   // See https://crbug.com/463869.
   enum State {
     STATE_UNINITIALIZED,
@@ skipping 51 matching lines @@
   State state_ = STATE_UNINITIALIZED;
 
   base::SequenceChecker sequence_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationDatabase);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_NOTIFICATIONS_NOTIFICATION_DATABASE_H_