Reverted the code for the non-interactive audible tab notification

chrome/android/java/src/org/chromium/chrome/browser/tab/ChromeTab.java

Index: chrome/android/java/src/org/chromium/chrome/browser/tab/ChromeTab.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/ChromeTab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/ChromeTab.java
index 257a5b6f6a67fad35cbdce826b46db8cd8c61663..d572650c4504ecc0e4b2f4668a265fcd88224411 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/ChromeTab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/ChromeTab.java
@@ -42,7 +42,7 @@ import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.OverrideUrlLoadingResult;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationParams;
 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
-import org.chromium.chrome.browser.media.MediaNotificationService;
+import org.chromium.chrome.browser.media.MediaCaptureNotificationService;
 import org.chromium.chrome.browser.media.ui.MediaSessionTabHelper;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.ntp.NativePageAssassin;
@@ -442,9 +442,9 @@ public class ChromeTab extends Tab {
         @Override
         public void navigationStateChanged(int flags) {
             if ((flags & InvalidateTypes.TAB) != 0) {
-                MediaNotificationService.updateMediaNotificationForTab(
+                MediaCaptureNotificationService.updateMediaNotificationForTab(
                         getApplicationContext(), getId(), isCapturingAudio(),
-                        isCapturingVideo(), false, getUrl());
+                        isCapturingVideo(), getUrl());
             }
             super.navigationStateChanged(flags);
         }
@@ -547,14 +547,6 @@ public class ChromeTab extends Tab {
             return !isClosing()
                     && ChromeWebContentsDelegateAndroid.nativeIsCapturingVideo(getWebContents());
         }
-
-        /**
-         * @return Whether audio is being played.
-         */
-        private boolean hasAudibleAudio() {
-            return !isClosing()
-                    && ChromeWebContentsDelegateAndroid.nativeHasAudibleAudio(getWebContents());
-        }
     }
 
     /**
@@ -784,8 +776,8 @@ public class ChromeTab extends Tab {
 
             @Override
             public void destroy() {
-                MediaNotificationService.updateMediaNotificationForTab(
-                        getApplicationContext(), getId(), false, false, false, getUrl());
+                MediaCaptureNotificationService.updateMediaNotificationForTab(
+                        getApplicationContext(), getId(), false, false, getUrl());
                 super.destroy();
             }
         };