Integrate the notification database with the normal code path.

chrome/browser/notifications/platform_notification_service_unittest.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 "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "chrome/browser/notifications/notification_test_util.h"
 #include "chrome/browser/notifications/platform_notification_service_impl.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/common/platform_notification_data.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace {
 
+#if !defined(OS_ANDROID)
+const int64_t kPersistentNotificationId = 42;
+#endif
+
 class MockDesktopNotificationDelegate
     : public content::DesktopNotificationDelegate {
  public:
   MockDesktopNotificationDelegate()
       : displayed_(false),
         clicked_(false) {}
 
   ~MockDesktopNotificationDelegate() override {}
 
   // content::DesktopNotificationDelegate implementation.
@@ skipping 89 matching lines @@
 
   ASSERT_FALSE(close_closure.is_null());
   close_closure.Run();
 
   EXPECT_EQ(0u, ui_manager()->GetNotificationCount());
 
   // Note that we cannot verify whether the closed event was called on the
   // delegate given that it'd result in a use-after-free.
 }
 
+// TODO(peter): Re-enable this test when //content is responsible for creating
+// the notification delegate ids.
+#if !defined(OS_ANDROID)
 TEST_F(PlatformNotificationServiceTest, PersistentNotificationDisplay) {
   content::PlatformNotificationData notification_data;
   notification_data.title = base::ASCIIToUTF16("My notification's title");
   notification_data.body = base::ASCIIToUTF16("Hello, world!");
 
   service()->DisplayPersistentNotification(
-      profile(), 42 /* sw_registration_id */, GURL("https://chrome.com/"),
+      profile(), kPersistentNotificationId, GURL("https://chrome.com/"),
       SkBitmap(), notification_data);
 
   ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
 
   const Notification& notification = ui_manager()->GetNotificationAt(0);
   EXPECT_EQ("https://chrome.com/", notification.origin_url().spec());
   EXPECT_EQ("My notification's title",
       base::UTF16ToUTF8(notification.title()));
   EXPECT_EQ("Hello, world!",
       base::UTF16ToUTF8(notification.message()));
 
-  service()->ClosePersistentNotification(profile(),
-                                         notification.delegate_id());
+  service()->ClosePersistentNotification(profile(), kPersistentNotificationId);
   EXPECT_EQ(0u, ui_manager()->GetNotificationCount());
 }
+#endif  // !defined(OS_ANDROID)
 
 TEST_F(PlatformNotificationServiceTest, DisplayPageNotificationMatches) {
   content::PlatformNotificationData notification_data;
   notification_data.title = base::ASCIIToUTF16("My notification's title");
   notification_data.body = base::ASCIIToUTF16("Hello, world!");
   notification_data.silent = true;
 
   MockDesktopNotificationDelegate* delegate
       = new MockDesktopNotificationDelegate();
   service()->DisplayNotification(profile(),
@@ skipping 83 matching lines @@
 
   service()->DisplayPersistentNotification(
       profile(), 42 /* sw_registration_id */, origin, SkBitmap(),
       content::PlatformNotificationData());
 
   base::Time after_persistent_notification =
       profile()->GetHostContentSettingsMap()->GetLastUsage(
           origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
   EXPECT_GT(after_persistent_notification, after_page_notification);
 }