[NOT FOR REVIEW] Significantly simplify the PlatformNotificationService //content API.

content/browser/notifications/notification_message_filter.h

Index: content/browser/notifications/notification_message_filter.h
diff --git a/content/browser/notifications/notification_message_filter.h b/content/browser/notifications/notification_message_filter.h
index c5ad0a4ac696afa0c7836f2b730a09a08b66796c..aad05c67043906df66b81321164aafa47e888c32 100644
--- a/content/browser/notifications/notification_message_filter.h
+++ b/content/browser/notifications/notification_message_filter.h
@@ -9,9 +9,11 @@
 
 #include "base/callback_forward.h"
 #include "base/memory/weak_ptr.h"
+#include "content/browser/notifications/notification_id_generator.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/notification_database_data.h"
 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationPermission.h"
+#include "ui/message_center/notification.h"
 
 class GURL;
 class SkBitmap;
@@ -52,7 +54,7 @@ class NotificationMessageFilter : public BrowserMessageFilter {
   void OnCheckNotificationPermission(
       const GURL& origin, blink::WebNotificationPermission* permission);
   void OnShowPlatformNotification(
-      int notification_id,
+      int non_persistent_notification_id,
       const GURL& origin,
       const SkBitmap& icon,
       const PlatformNotificationData& notification_data);
@@ -66,7 +68,7 @@ class NotificationMessageFilter : public BrowserMessageFilter {
                           int64_t service_worker_registration_id,
                           const GURL& origin,
                           const std::string& filter_tag);
-  void OnClosePlatformNotification(int notification_id);
+  void OnClosePlatformNotification(int non_persistent_notification_id);
   void OnClosePersistentNotification(
       const GURL& origin,
       int64_t persistent_notification_id);
@@ -111,11 +113,13 @@ class NotificationMessageFilter : public BrowserMessageFilter {
       PlatformNotificationService* service,
       const GURL& origin);
 
-  int process_id_;
+  int render_process_id_;
   scoped_refptr<PlatformNotificationContextImpl> notification_context_;
   ResourceContext* resource_context_;
   BrowserContext* browser_context_;
 
+  NotificationIdGenerator notification_id_generator_;
+
   // Map mapping notification ids to their associated close closures.
   std::map<int, base::Closure> close_closures_;