Fixing headset unplug issues in MediaNotification

chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
index 3b6349be3d7d99e0e9dc7ba74ee7da038ca21e19..9125c0ef61a5609337bb036ad8b5ebe6f06ec6a0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
@@ -436,10 +436,12 @@ public class MediaNotificationManager {
     }
 
     private void onPlay(int actionSource) {
+        if (!mMediaNotificationInfo.isPaused) return;
         mMediaNotificationInfo.listener.onPlay(actionSource);
     }
 
     private void onPause(int actionSource) {
+        if (mMediaNotificationInfo.isPaused) return;
         mMediaNotificationInfo.listener.onPause(actionSource);
     }
 
@@ -522,6 +524,7 @@ public class MediaNotificationManager {
 
         if (mMediaNotificationInfo.supportsSwipeAway()) {
             mNotificationBuilder.setOngoing(!mMediaNotificationInfo.isPaused);
+            mNotificationBuilder.setDeleteIntent(createPendingIntent(ListenerService.ACTION_STOP));
         }
 
         // The intent will currently only be null when using a custom tab.