Revert of Gardening: Revert "Use AudioStreamMonitor to control power save blocking."

chrome/browser/ui/tabs/tab_utils.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/tabs/tab_utils.h"
 
 #include "base/strings/string16.h"
-#include "chrome/browser/media/audio_stream_monitor.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/media_stream_capture_indicator.h"
 #include "chrome/grit/generated_resources.h"
+#include "content/public/browser/web_contents.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/animation/multi_animation.h"
 
 namespace chrome {
 
 namespace {
 
 // Interval between frame updates of the tab indicator animations.  This is not
@@ skipping 88 matching lines @@
                               bool is_active_tab) {
   if (is_pinned_tab)
     return false;
   else if (is_active_tab)
     return true;
   else
     return capacity >= 3;
 }
 
 bool IsPlayingAudio(content::WebContents* contents) {
-  AudioStreamMonitor* const audio_stream_monitor =
-      AudioStreamMonitor::FromWebContents(contents);
-  return audio_stream_monitor && audio_stream_monitor->WasRecentlyAudible();
+  return contents->WasRecentlyAudible();
 }
 
 TabMediaState GetTabMediaStateForContents(content::WebContents* contents) {
   if (!contents)
     return TAB_MEDIA_STATE_NONE;
 
   scoped_refptr<MediaStreamCaptureIndicator> indicator =
       MediaCaptureDevicesDispatcher::GetInstance()->
           GetMediaStreamCaptureIndicator();
   if (indicator.get()) {
@@ skipping 69 matching lines @@
           l10n_util::GetStringUTF16(IDS_TOOLTIP_TAB_MEDIA_STATE_CAPTURING));
       break;
     case TAB_MEDIA_STATE_NONE:
       NOTREACHED();
       break;
   }
   return result;
 }
 
 }  // namespace chrome