Clean up the NotificationUIManagerAndroid.

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

 // Copyright 2015 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.
 
 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;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.chrome.browser.preferences.website.ContentSetting;
@@ skipping 205 matching lines @@
         assertNotNull(generator);
 
         Bitmap generatedIcon = generator.generateIconForUrl(getOrigin());
         assertNotNull(generatedIcon);
 
         assertEquals(generatedIcon.getWidth(), notification.largeIcon.getWidth());
         assertEquals(generatedIcon.getHeight(), notification.largeIcon.getHeight());
     }
 
     /*
-     * 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().
      */
     @LargeTest
     @Feature({"Browser", "Notifications"})
     public void testNotificationContentIntentClosesNotification() throws Exception {
         setNotificationContentSettingForCurrentOrigin(ContentSetting.ALLOW);
 
         Notification notification = showAndGetNotification("MyNotification", "{}");
@@ skipping 125 matching lines @@
         assertNull(NotificationUIManager.getOriginFromTag(";"));
         assertNull(NotificationUIManager.getOriginFromTag(";;;;;;;"));
         assertNull(NotificationUIManager.getOriginFromTag(
                 "SystemDownloadNotifier;NotificationUIManager;42"));
         assertNull(NotificationUIManager.getOriginFromTag(
                 "SystemDownloadNotifier;https://example.com;42"));
         assertNull(NotificationUIManager.getOriginFromTag(
                 "NotificationUIManager;SystemDownloadNotifier;42"));
     }
 }