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

Side by Side Diff: webrtc/api/peerconnection_unittest.cc

Issue 1684163002: Rename webrtc/media/webrtc -> webrtc/media/engine (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase f396f6085f9e4f16f37471a7828e3e31308c0d52 #11590 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 | « webrtc/api/java/jni/peerconnection_jni.cc ('k') | webrtc/api/peerconnectionfactory.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 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 20 matching lines...) Expand all
31 #include "webrtc/api/test/fakevideotrackrenderer.h" 31 #include "webrtc/api/test/fakevideotrackrenderer.h"
32 #include "webrtc/api/test/mockpeerconnectionobservers.h" 32 #include "webrtc/api/test/mockpeerconnectionobservers.h"
33 #include "webrtc/api/videosourceinterface.h" 33 #include "webrtc/api/videosourceinterface.h"
34 #include "webrtc/base/gunit.h" 34 #include "webrtc/base/gunit.h"
35 #include "webrtc/base/physicalsocketserver.h" 35 #include "webrtc/base/physicalsocketserver.h"
36 #include "webrtc/base/scoped_ptr.h" 36 #include "webrtc/base/scoped_ptr.h"
37 #include "webrtc/base/ssladapter.h" 37 #include "webrtc/base/ssladapter.h"
38 #include "webrtc/base/sslstreamadapter.h" 38 #include "webrtc/base/sslstreamadapter.h"
39 #include "webrtc/base/thread.h" 39 #include "webrtc/base/thread.h"
40 #include "webrtc/base/virtualsocketserver.h" 40 #include "webrtc/base/virtualsocketserver.h"
41 #include "webrtc/media/webrtc/fakewebrtcvideoengine.h" 41 #include "webrtc/media/engine/fakewebrtcvideoengine.h"
42 #include "webrtc/p2p/base/constants.h" 42 #include "webrtc/p2p/base/constants.h"
43 #include "webrtc/p2p/base/sessiondescription.h" 43 #include "webrtc/p2p/base/sessiondescription.h"
44 #include "webrtc/p2p/client/fakeportallocator.h" 44 #include "webrtc/p2p/client/fakeportallocator.h"
45 45
46 #define MAYBE_SKIP_TEST(feature) \ 46 #define MAYBE_SKIP_TEST(feature) \
47 if (!(feature())) { \ 47 if (!(feature())) { \
48 LOG(LS_INFO) << "Feature disabled... skipping"; \ 48 LOG(LS_INFO) << "Feature disabled... skipping"; \
49 return; \ 49 return; \
50 } 50 }
51 51
(...skipping 1951 matching lines...) Expand 10 before | Expand all | Expand 10 after
2003 PeerConnectionInterface::IceServer server; 2003 PeerConnectionInterface::IceServer server;
2004 server.urls.push_back("turn:hostname"); 2004 server.urls.push_back("turn:hostname");
2005 server.urls.push_back("turn:hostname2"); 2005 server.urls.push_back("turn:hostname2");
2006 servers.push_back(server); 2006 servers.push_back(server);
2007 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_)); 2007 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_));
2008 EXPECT_EQ(2U, turn_servers_.size()); 2008 EXPECT_EQ(2U, turn_servers_.size());
2009 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority); 2009 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority);
2010 } 2010 }
2011 2011
2012 #endif // if !defined(THREAD_SANITIZER) 2012 #endif // if !defined(THREAD_SANITIZER)
OLDNEW
« no previous file with comments | « webrtc/api/java/jni/peerconnection_jni.cc ('k') | webrtc/api/peerconnectionfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698