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

Unified Diff: webrtc/media/base/videoengine_unittest.h

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 years, 10 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
« no previous file with comments | « webrtc/media/base/videocommon_unittest.cc ('k') | webrtc/media/base/videoframe.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/base/videoengine_unittest.h
diff --git a/talk/media/base/videoengine_unittest.h b/webrtc/media/base/videoengine_unittest.h
similarity index 99%
rename from talk/media/base/videoengine_unittest.h
rename to webrtc/media/base/videoengine_unittest.h
index e3d521d37e47490eef791f5ab95bb2d23c61f9f7..1b2aedf6b76f80796fdc416bb7898c2c9c075f68 100644
--- a/talk/media/base/videoengine_unittest.h
+++ b/webrtc/media/base/videoengine_unittest.h
@@ -25,22 +25,22 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef TALK_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ // NOLINT
-#define TALK_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_
+#ifndef WEBRTC_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ // NOLINT
+#define WEBRTC_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_
#include <string>
#include <vector>
-#include "talk/media/base/fakenetworkinterface.h"
-#include "talk/media/base/fakevideocapturer.h"
-#include "talk/media/base/fakevideorenderer.h"
-#include "talk/media/base/mediachannel.h"
-#include "talk/media/base/streamparams.h"
-#include "talk/media/webrtc/fakewebrtccall.h"
#include "webrtc/base/bytebuffer.h"
#include "webrtc/base/gunit.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/call.h"
+#include "webrtc/media/base/fakenetworkinterface.h"
+#include "webrtc/media/base/fakevideocapturer.h"
+#include "webrtc/media/base/fakevideorenderer.h"
+#include "webrtc/media/base/mediachannel.h"
+#include "webrtc/media/base/streamparams.h"
+#include "webrtc/media/webrtc/fakewebrtccall.h"
#define EXPECT_FRAME_WAIT(c, w, h, t) \
EXPECT_EQ_WAIT((c), renderer_.num_rendered_frames(), (t)); \
@@ -1220,4 +1220,4 @@ class VideoMediaChannelTest : public testing::Test,
cricket::FakeVideoRenderer renderer2_;
};
-#endif // TALK_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ NOLINT
+#endif // WEBRTC_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ NOLINT
« no previous file with comments | « webrtc/media/base/videocommon_unittest.cc ('k') | webrtc/media/base/videoframe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698