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

Unified Diff: talk/session/media/channelmanager_unittest.cc

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 | « talk/session/media/channelmanager.cc ('k') | talk/session/media/currentspeakermonitor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/session/media/channelmanager_unittest.cc
diff --git a/talk/session/media/channelmanager_unittest.cc b/talk/session/media/channelmanager_unittest.cc
index 4740f0f37dbf58c440c72947b778b244b53362c4..81faad4eb45552c75625dc8f5a4dbc485e61e5fd 100644
--- a/talk/session/media/channelmanager_unittest.cc
+++ b/talk/session/media/channelmanager_unittest.cc
@@ -26,15 +26,15 @@
*/
#include "talk/app/webrtc/fakemediacontroller.h"
-#include "talk/media/base/fakecapturemanager.h"
-#include "talk/media/base/fakemediaengine.h"
-#include "talk/media/base/fakevideocapturer.h"
-#include "talk/media/base/testutils.h"
-#include "talk/media/webrtc/fakewebrtccall.h"
#include "talk/session/media/channelmanager.h"
#include "webrtc/base/gunit.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/thread.h"
+#include "webrtc/media/base/fakecapturemanager.h"
+#include "webrtc/media/base/fakemediaengine.h"
+#include "webrtc/media/base/fakevideocapturer.h"
+#include "webrtc/media/base/testutils.h"
+#include "webrtc/media/webrtc/fakewebrtccall.h"
#include "webrtc/p2p/base/faketransportcontroller.h"
namespace cricket {
« no previous file with comments | « talk/session/media/channelmanager.cc ('k') | talk/session/media/currentspeakermonitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698