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

Unified Diff: webrtc/video/encoder_state_feedback_unittest.cc

Issue 1506773002: Merge webrtc/video_engine/ into webrtc/video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase 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
« no previous file with comments | « webrtc/video/encoder_state_feedback.cc ('k') | webrtc/video/overuse_frame_detector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/encoder_state_feedback_unittest.cc
diff --git a/webrtc/video_engine/encoder_state_feedback_unittest.cc b/webrtc/video/encoder_state_feedback_unittest.cc
similarity index 97%
rename from webrtc/video_engine/encoder_state_feedback_unittest.cc
rename to webrtc/video/encoder_state_feedback_unittest.cc
index 6024790c7686cc46b2f43cf27cfca4bc1da759c3..834447e513e79c06f29be9c5a9324381f7049e51 100644
--- a/webrtc/video_engine/encoder_state_feedback_unittest.cc
+++ b/webrtc/video/encoder_state_feedback_unittest.cc
@@ -10,7 +10,7 @@
// This file includes unit tests for EncoderStateFeedback.
-#include "webrtc/video_engine/encoder_state_feedback.h"
+#include "webrtc/video/encoder_state_feedback.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -22,8 +22,8 @@
#include "webrtc/modules/pacing/packet_router.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/modules/utility/include/mock/mock_process_thread.h"
-#include "webrtc/video_engine/payload_router.h"
-#include "webrtc/video_engine/vie_encoder.h"
+#include "webrtc/video/payload_router.h"
+#include "webrtc/video/vie_encoder.h"
using ::testing::NiceMock;
« no previous file with comments | « webrtc/video/encoder_state_feedback.cc ('k') | webrtc/video/overuse_frame_detector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698