Integrate the notification database with the normal code path.

chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationUIManagerTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationUIManagerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationUIManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationUIManagerTest.java
index 3aca840ecfcdfb2aada670c4b5653bfc10830475..7b142dc17b050b77c5258cd9fae0ee52c9976ade 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationUIManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationUIManagerTest.java
@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.notifications;
 import android.app.Notification;
 import android.graphics.Bitmap;
 import android.os.Build;
-import android.test.FlakyTest;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
@@ -233,28 +232,6 @@ public class NotificationUIManagerTest extends ChromeShellTestBase {
     }
 
     /*
-     * Verifies that starting the PendingIntent stored as the notification's delete intent will
-     * close the notification.
-     */
-    /* @MediumTest */
-    @FlakyTest
-    @Feature({"Browser", "Notifications"})
-    public void testNotificationDeleteIntentClosesNotification() throws Exception {
-        setNotificationContentSettingForCurrentOrigin(ContentSetting.ALLOW);
-
-        Notification notification = showAndGetNotification("MyNotification", "{}");
-        assertEquals(1, mMockNotificationManager.getNotifications().size());
-
-        // Sending the PendingIntent simulates dismissing (swiping away) the notification.
-        assertNotNull(notification.deleteIntent);
-        notification.deleteIntent.send();
-        // The deleteIntent should trigger a call to cancel() in the NotificationManager.
-        assertTrue(waitForNotificationManagerMutation());
-
-        assertEquals(0, mMockNotificationManager.getNotifications().size());
-    }
-
-    /*
      * Verifies that starting the PendingIntent stored as the notification's content intent will
      * start up the associated Service Worker, where the JavaScript code will close the notification
      * by calling event.notification.close().