talk/app/webrtc/peerconnectioninterface_unittest.cc - Issue 1587193006: Move talk/media to webrtc/media

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/peerconnectioninterface_unittest.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Disable sign-compare warning on Win Clang Created 4 years, 11 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:

Index: talk/app/webrtc/peerconnectioninterface_unittest.cc

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

index 421836e74e2569dd87257410d93a29779389da29..2388e71c04de7560ab9aaa6a0ba656fa1af6ba89 100644

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

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

@@ -46,8 +46,6 @@

#include "talk/app/webrtc/test/testsdpstrings.h"

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

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

-#include "talk/media/base/fakevideocapturer.h"

-#include "talk/media/sctp/sctpdataengine.h"

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

#include "webrtc/base/gunit.h"

#include "webrtc/base/scoped_ptr.h"

@@ -55,6 +53,8 @@

#include "webrtc/base/sslstreamadapter.h"

#include "webrtc/base/stringutils.h"

#include "webrtc/base/thread.h"

+#include "webrtc/media/base/fakevideocapturer.h"

+#include "webrtc/media/sctp/sctpdataengine.h"

#include "webrtc/p2p/client/fakeportallocator.h"

static const char kStreamLabel1[] = "local_stream_1";