Integrate the notification database with the normal code path.

content/child/notifications/notification_manager.cc

 // 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 "content/child/notifications/notification_manager.h"
 
 #include "base/lazy_instance.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread_local.h"
 #include "content/child/notifications/notification_data_conversions.h"
 #include "content/child/notifications/notification_dispatcher.h"
 #include "content/child/service_worker/web_service_worker_registration_impl.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/worker_task_runner.h"
 #include "content/public/common/platform_notification_data.h"
 #include "third_party/WebKit/public/platform/WebSerializedOrigin.h"
@@ skipping 139 matching lines @@
     return;
   }
 
   // It should not be possible for Blink to call close() on a Notification which
   // does not exist in either the pending or active notification lists.
   NOTREACHED();
 }
 
 void NotificationManager::closePersistent(
     const blink::WebSerializedOrigin& origin,
-    const blink::WebString& persistent_notification_id) {
+    const blink::WebString& persistent_notification_id_string) {
+  // TODO(peter): Blink should store the persistent_notification_id as an
+  // int64_t instead of a string. The id, created by Chromium, is a decimal
+  // number that fits in an int64_t, so convert it until the API updates.
+  base::string16 string_value = persistent_notification_id_string;
+
+  int64_t persistent_notification_id = 0;
+  if (!base::StringToInt64(string_value,
+                           &persistent_notification_id)) {
+    DLOG(ERROR) << "Unable to close persistent notification; invalid id: "
+                << string_value;
+    return;
+  }
+
   thread_safe_sender_->Send(new PlatformNotificationHostMsg_ClosePersistent(
       GURL(origin.string()),
-      base::UTF16ToUTF8(persistent_notification_id)));
+      persistent_notification_id));
 }
 
 void NotificationManager::notifyDelegateDestroyed(
     blink::WebNotificationDelegate* delegate) {
   if (pending_notifications_.CancelPageNotificationFetches(delegate))
     return;
 
   for (auto& iter : active_page_notifications_) {
     if (iter.second != delegate)
       continue;
@@ skipping 132 matching lines @@
   thread_safe_sender_->Send(
       new PlatformNotificationHostMsg_ShowPersistent(
           request_id,
           service_worker_registration_id,
           GURL(origin.string()),
           icon,
           ToPlatformNotificationData(notification_data)));
 }
 
 }  // namespace content