talk/app/webrtc/videotrack_unittest.cc - Issue 1346153002: Remove use of DeviceManager from ChannelManager.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: talk/app/webrtc/videotrack_unittest.cc

Issue 1346153002: Remove use of DeviceManager from ChannelManager. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: rebase Created 5 years, 3 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: talk/app/webrtc/videotrack_unittest.cc

diff --git a/talk/app/webrtc/videotrack_unittest.cc b/talk/app/webrtc/videotrack_unittest.cc

index 324a88ba4ccfaa1f8a7a2189c7dbd4cffac17175..6db3c525c5520e2a892d1feda882c00d29c20dd8 100644

--- a/talk/app/webrtc/videotrack_unittest.cc

+++ b/talk/app/webrtc/videotrack_unittest.cc

@@ -32,7 +32,6 @@

#include "talk/app/webrtc/videosource.h"

#include "talk/app/webrtc/videotrack.h"

#include "talk/media/base/fakemediaengine.h"

-#include "talk/media/devices/fakedevicemanager.h"

#include "talk/media/webrtc/webrtcvideoframe.h"

#include "talk/session/media/channelmanager.h"

#include "webrtc/base/gunit.h"

@@ -58,8 +57,7 @@ class VideoTrackTest : public testing::Test {

static const char kVideoTrackId[] = "track_id";

channel_manager_.reset(new cricket::ChannelManager(

- new cricket::FakeMediaEngine(), new cricket::FakeDeviceManager(),

- rtc::Thread::Current()));

+ new cricket::FakeMediaEngine(), rtc::Thread::Current()));

EXPECT_TRUE(channel_manager_->Init());

video_track_ = VideoTrack::Create(

kVideoTrackId,

« no previous file with comments | « talk/app/webrtc/videosource_unittest.cc ('k') | talk/app/webrtc/webrtcsession_unittest.cc » ('j') | talk/session/media/channelmanager.cc » ('J')