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

Side by Side Diff: talk/app/webrtc/peerconnection_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 unified diff | Download patch
« no previous file with comments | « talk/app/webrtc/peerconnection.cc ('k') | talk/app/webrtc/peerconnectionendtoend_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 29 matching lines...) Expand all
40 #include "talk/app/webrtc/peerconnection.h" 40 #include "talk/app/webrtc/peerconnection.h"
41 #include "talk/app/webrtc/peerconnectionfactory.h" 41 #include "talk/app/webrtc/peerconnectionfactory.h"
42 #include "talk/app/webrtc/peerconnectioninterface.h" 42 #include "talk/app/webrtc/peerconnectioninterface.h"
43 #include "talk/app/webrtc/test/fakeaudiocapturemodule.h" 43 #include "talk/app/webrtc/test/fakeaudiocapturemodule.h"
44 #include "talk/app/webrtc/test/fakeconstraints.h" 44 #include "talk/app/webrtc/test/fakeconstraints.h"
45 #include "talk/app/webrtc/test/fakedtlsidentitystore.h" 45 #include "talk/app/webrtc/test/fakedtlsidentitystore.h"
46 #include "talk/app/webrtc/test/fakeperiodicvideocapturer.h" 46 #include "talk/app/webrtc/test/fakeperiodicvideocapturer.h"
47 #include "talk/app/webrtc/test/fakevideotrackrenderer.h" 47 #include "talk/app/webrtc/test/fakevideotrackrenderer.h"
48 #include "talk/app/webrtc/test/mockpeerconnectionobservers.h" 48 #include "talk/app/webrtc/test/mockpeerconnectionobservers.h"
49 #include "talk/app/webrtc/videosourceinterface.h" 49 #include "talk/app/webrtc/videosourceinterface.h"
50 #include "talk/media/webrtc/fakewebrtcvideoengine.h"
51 #include "talk/session/media/mediasession.h" 50 #include "talk/session/media/mediasession.h"
52 #include "webrtc/base/gunit.h" 51 #include "webrtc/base/gunit.h"
53 #include "webrtc/base/physicalsocketserver.h" 52 #include "webrtc/base/physicalsocketserver.h"
54 #include "webrtc/base/scoped_ptr.h" 53 #include "webrtc/base/scoped_ptr.h"
55 #include "webrtc/base/ssladapter.h" 54 #include "webrtc/base/ssladapter.h"
56 #include "webrtc/base/sslstreamadapter.h" 55 #include "webrtc/base/sslstreamadapter.h"
57 #include "webrtc/base/thread.h" 56 #include "webrtc/base/thread.h"
58 #include "webrtc/base/virtualsocketserver.h" 57 #include "webrtc/base/virtualsocketserver.h"
58 #include "webrtc/media/webrtc/fakewebrtcvideoengine.h"
59 #include "webrtc/p2p/base/constants.h" 59 #include "webrtc/p2p/base/constants.h"
60 #include "webrtc/p2p/base/sessiondescription.h" 60 #include "webrtc/p2p/base/sessiondescription.h"
61 #include "webrtc/p2p/client/fakeportallocator.h" 61 #include "webrtc/p2p/client/fakeportallocator.h"
62 62
63 #define MAYBE_SKIP_TEST(feature) \ 63 #define MAYBE_SKIP_TEST(feature) \
64 if (!(feature())) { \ 64 if (!(feature())) { \
65 LOG(LS_INFO) << "Feature disabled... skipping"; \ 65 LOG(LS_INFO) << "Feature disabled... skipping"; \
66 return; \ 66 return; \
67 } 67 }
68 68
(...skipping 1953 matching lines...) Expand 10 before | Expand all | Expand 10 after
2022 PeerConnectionInterface::IceServer server; 2022 PeerConnectionInterface::IceServer server;
2023 server.urls.push_back("turn:hostname"); 2023 server.urls.push_back("turn:hostname");
2024 server.urls.push_back("turn:hostname2"); 2024 server.urls.push_back("turn:hostname2");
2025 servers.push_back(server); 2025 servers.push_back(server);
2026 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_)); 2026 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_));
2027 EXPECT_EQ(2U, turn_servers_.size()); 2027 EXPECT_EQ(2U, turn_servers_.size());
2028 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority); 2028 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority);
2029 } 2029 }
2030 2030
2031 #endif // if !defined(THREAD_SANITIZER) 2031 #endif // if !defined(THREAD_SANITIZER)
OLDNEW
« no previous file with comments | « talk/app/webrtc/peerconnection.cc ('k') | talk/app/webrtc/peerconnectionendtoend_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698