content/renderer/media/rtc_peer_connection_handler_unittest.cc - Issue 272043003: Renamed MediaStreamDependencyFactory to PeerConnectionDependencyFactory.

Unified Diff: content/renderer/media/rtc_peer_connection_handler_unittest.cc

Issue 272043003: Renamed MediaStreamDependencyFactory to PeerConnectionDependencyFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: media_stream_dependency_factory_unittest.cc Created 6 years, 7 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

« content/renderer/media/rtc_peer_connection_handler.cc ('K') | « content/renderer/media/rtc_peer_connection_handler.cc ('k') | content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/rtc_peer_connection_handler_unittest.cc

diff --git a/content/renderer/media/rtc_peer_connection_handler_unittest.cc b/content/renderer/media/rtc_peer_connection_handler_unittest.cc

index dae520067cc654acf33ef5e8839c48ba1df7b59d..7ed95ffb2af4400223ab4b52a6d29d08bb80c0f1 100644

--- a/content/renderer/media/rtc_peer_connection_handler_unittest.cc

+++ b/content/renderer/media/rtc_peer_connection_handler_unittest.cc

@@ -14,13 +14,13 @@

#include "content/renderer/media/media_stream_audio_source.h"

#include "content/renderer/media/media_stream_source.h"

#include "content/renderer/media/media_stream_video_track.h"

-#include "content/renderer/media/mock_media_stream_dependency_factory.h"

#include "content/renderer/media/mock_media_stream_video_source.h"

#include "content/renderer/media/mock_peer_connection_impl.h"

#include "content/renderer/media/mock_web_rtc_peer_connection_handler_client.h"

#include "content/renderer/media/peer_connection_tracker.h"

#include "content/renderer/media/rtc_media_constraints.h"

#include "content/renderer/media/rtc_peer_connection_handler.h"

+#include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h"

#include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"

#include "content/renderer/media/webrtc_audio_capturer.h"

#include "testing/gmock/include/gmock/gmock.h"

@@ -187,7 +187,7 @@ class RTCPeerConnectionHandlerUnderTest : public RTCPeerConnectionHandler {

public:

RTCPeerConnectionHandlerUnderTest(

WebRTCPeerConnectionHandlerClient* client,

- MediaStreamDependencyFactory* dependency_factory)

+ PeerConnectionDependencyFactory* dependency_factory)

: RTCPeerConnectionHandler(client, dependency_factory) {

}

@@ -205,7 +205,7 @@ class RTCPeerConnectionHandlerTest : public ::testing::Test {

virtual void SetUp() {

mock_client_.reset(new NiceMock<MockWebRTCPeerConnectionHandlerClient>());

- mock_dependency_factory_.reset(new MockMediaStreamDependencyFactory());

+ mock_dependency_factory_.reset(new MockPeerConnectionDependencyFactory());

pc_handler_.reset(

new RTCPeerConnectionHandlerUnderTest(mock_client_.get(),

mock_dependency_factory_.get()));

@@ -290,7 +290,7 @@ class RTCPeerConnectionHandlerTest : public ::testing::Test {

base::MessageLoop message_loop_;

scoped_ptr<ChildProcess> child_process_;

scoped_ptr<MockWebRTCPeerConnectionHandlerClient> mock_client_;

- scoped_ptr<MockMediaStreamDependencyFactory> mock_dependency_factory_;

+ scoped_ptr<MockPeerConnectionDependencyFactory> mock_dependency_factory_;

scoped_ptr<NiceMock<MockPeerConnectionTracker> > mock_tracker_;

scoped_ptr<RTCPeerConnectionHandlerUnderTest> pc_handler_;