webrtc/video_engine/payload_router_unittest.cc - Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/

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: webrtc/video_engine/payload_router_unittest.cc

Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Resolved merge conflict Created 5 years 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: webrtc/video_engine/payload_router_unittest.cc

diff --git a/webrtc/video/payload_router_unittest.cc b/webrtc/video_engine/payload_router_unittest.cc

similarity index 99%

rename from webrtc/video/payload_router_unittest.cc

rename to webrtc/video_engine/payload_router_unittest.cc

index 8c22f2fd5cc1d210f3f0607babe8b900d5f424f7..11c664b4a1fa0616ccabb5205d9e6c8508191474 100644

--- a/webrtc/video/payload_router_unittest.cc

+++ b/webrtc/video_engine/payload_router_unittest.cc

@@ -16,7 +16,7 @@

#include "webrtc/base/scoped_ptr.h"

#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"

#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"

-#include "webrtc/video/payload_router.h"

+#include "webrtc/video_engine/payload_router.h"

using ::testing::_;

using ::testing::AnyNumber;

« no previous file with comments | « webrtc/video_engine/payload_router.cc ('k') | webrtc/video_engine/report_block_stats.h » ('j') | no next file with comments »