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

Unified Diff: content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc

Issue 2897603004: WebRtcMediaStreamAdapter using WebRtcMediaStreamTrackMap. (Closed)
Patch Set: Rebase Created 3 years, 6 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
Index: content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc
diff --git a/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc b/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc
index 8b9f896165b73e2a81428c2b1b0f106c3061f1b9..37637cb1ad8a77e2e02ca4e9f5763ff8bd0ecb83 100644
--- a/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc
+++ b/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc
@@ -9,6 +9,7 @@
#include <memory>
#include "base/message_loop/message_loop.h"
+#include "base/threading/thread_task_runner_handle.h"
#include "content/child/child_process.h"
#include "content/renderer/media/media_stream.h"
#include "content/renderer/media/media_stream_video_source.h"
@@ -18,6 +19,7 @@
#include "content/renderer/media/mock_media_stream_video_source.h"
#include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h"
#include "content/renderer/media/webrtc/processed_local_audio_source.h"
+#include "content/renderer/media/webrtc/webrtc_media_stream_track_adapter_map.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebMediaStream.h"
@@ -35,10 +37,13 @@ class WebRtcMediaStreamAdapterTest : public ::testing::Test {
void SetUp() override {
child_process_.reset(new ChildProcess());
dependency_factory_.reset(new MockPeerConnectionDependencyFactory());
+ track_adapter_map_ = new WebRtcMediaStreamTrackAdapterMap(
+ dependency_factory_.get(), base::ThreadTaskRunnerHandle::Get());
}
void TearDown() override {
adapter_.reset();
+ track_adapter_map_ = nullptr;
blink::WebHeap::CollectAllGarbageForTesting();
}
@@ -96,7 +101,7 @@ class WebRtcMediaStreamAdapterTest : public ::testing::Test {
size_t expected_number_of_audio_tracks,
size_t expected_number_of_video_tracks) {
adapter_.reset(new WebRtcMediaStreamAdapter(
- blink_stream, dependency_factory_.get()));
+ dependency_factory_.get(), track_adapter_map_, blink_stream));
EXPECT_EQ(expected_number_of_audio_tracks,
adapter_->webrtc_media_stream()->GetAudioTracks().size());
@@ -118,6 +123,7 @@ class WebRtcMediaStreamAdapterTest : public ::testing::Test {
base::MessageLoop message_loop_;
std::unique_ptr<ChildProcess> child_process_;
std::unique_ptr<MockPeerConnectionDependencyFactory> dependency_factory_;
+ scoped_refptr<WebRtcMediaStreamTrackAdapterMap> track_adapter_map_;
std::unique_ptr<WebRtcMediaStreamAdapter> adapter_;
MockAudioDeviceFactory mock_audio_device_factory_;
};

Powered by Google App Engine
This is Rietveld 408576698