Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: content/browser/renderer_host/media/audio_output_delegate_impl_unittest.cc

Issue 2800013003: Remove some unnecessary stuff from AudioOutputDelegateImplUnitTest. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/audio_output_delegate_impl_unittest.cc
diff --git a/content/browser/renderer_host/media/audio_output_delegate_impl_unittest.cc b/content/browser/renderer_host/media/audio_output_delegate_impl_unittest.cc
index 800a071329d957efc34b53096c9956e9c5215fc2..355cdce4a6aca0ba145371917fe871d9f6a47dca 100644
--- a/content/browser/renderer_host/media/audio_output_delegate_impl_unittest.cc
+++ b/content/browser/renderer_host/media/audio_output_delegate_impl_unittest.cc
@@ -16,12 +16,10 @@
#include "base/run_loop.h"
#include "content/browser/audio_manager_thread.h"
#include "content/browser/media/capture/audio_mirroring_manager.h"
-#include "content/browser/renderer_host/media/media_stream_manager.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/media_observer.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "media/audio/audio_output_controller.h"
-#include "media/audio/audio_system_impl.h"
#include "media/audio/fake_audio_log_factory.h"
#include "media/audio/fake_audio_manager.h"
#include "media/base/media_switches.h"
@@ -33,12 +31,6 @@ using ::testing::InSequence;
using ::testing::NotNull;
using ::testing::StrictMock;
-// TODO(maxmorin): not yet tested:
-// - Interactions with AudioStreamMonitor (goes through WebContentsImpl,
-// so it's a bit tricky).
-// - Logging (small risk of bugs, not worth the effort).
-// - That the returned socket/memory is correctly set up.
-
namespace content {
namespace {
@@ -116,9 +108,6 @@ class AudioOutputDelegateTest : public testing::Test {
audio_manager_.reset(new media::FakeAudioManager(
audio_thread_->task_runner(), audio_thread_->worker_task_runner(),
&log_factory_));
- audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get());
- media_stream_manager_ =
- base::MakeUnique<MediaStreamManager>(audio_system_.get());
}
// Test bodies are here, so that we can run them on the IO thread.
@@ -446,13 +435,9 @@ class AudioOutputDelegateTest : public testing::Test {
}
protected:
- // MediaStreamManager uses a DestructionObserver, so it must outlive the
- // TestBrowserThreadBundle.
- std::unique_ptr<MediaStreamManager> media_stream_manager_;
std::unique_ptr<TestBrowserThreadBundle> thread_bundle_;
std::unique_ptr<AudioManagerThread> audio_thread_;
media::ScopedAudioManagerPtr audio_manager_;
- std::unique_ptr<media::AudioSystem> audio_system_;
StrictMock<MockAudioMirroringManager> mirroring_manager_;
StrictMock<MockEventHandler> event_handler_;
StrictMock<MockObserver> media_observer_;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698