Clean up the NotificationUIManagerAndroid.

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 {

[johnme, 2015/04/09 17:00:01]

I don't understand why this test doesn't make sense anymore? What do you mean by
"it stops us from double-closing notifications"?

[Peter Beverloo, 2015/04/09 17:34:41]

Firstly - good point, I'm now removing this test in the larger integration CL.

The reason that this test worked is because, prior to the integration CL, the
close handler in NotificationUIManagerAndroid called RemoveProfileNotification
which then closed the notification (again!) on the platform.

That obviously is not necessary, since the OnNotificationClosed gets called
*when* a notification closes. This test was kind of bogus to start with and only
worked due to an implementation detail.

-        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().