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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/video_engine/call_stats_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
« no previous file with comments | « webrtc/video_engine/call_stats.cc ('k') | webrtc/video_engine/encoder_state_feedback.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video_engine/call_stats_unittest.cc
diff --git a/webrtc/video/call_stats_unittest.cc b/webrtc/video_engine/call_stats_unittest.cc
similarity index 99%
rename from webrtc/video/call_stats_unittest.cc
rename to webrtc/video_engine/call_stats_unittest.cc
index 6b2e38ff3eea2e2d731a56ce69081b8d7b0d5be2..bfba5cb72aa16745dd624a8c992c263e3115c6b4 100644
--- a/webrtc/video/call_stats_unittest.cc
+++ b/webrtc/video_engine/call_stats_unittest.cc
@@ -14,7 +14,7 @@
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/system_wrappers/include/tick_util.h"
-#include "webrtc/video/call_stats.h"
+#include "webrtc/video_engine/call_stats.h"
using ::testing::_;
using ::testing::AnyNumber;
« no previous file with comments | « webrtc/video_engine/call_stats.cc ('k') | webrtc/video_engine/encoder_state_feedback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698