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

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

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed processing of api.gyp for Chromium builds 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/peerconnectionfactory.cc ('k') | webrtc/api/peerconnectionfactoryproxy.h » ('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 10 matching lines...) Expand all
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include <string> 28 #include <string>
29 #include <utility> 29 #include <utility>
30 30
31 #include "talk/app/webrtc/mediastreaminterface.h" 31 #include "webrtc/api/mediastreaminterface.h"
32 #include "talk/app/webrtc/peerconnectionfactory.h" 32 #include "webrtc/api/peerconnectionfactory.h"
33 #ifdef WEBRTC_ANDROID 33 #ifdef WEBRTC_ANDROID
34 #include "talk/app/webrtc/test/androidtestinitializer.h" 34 #include "webrtc/api/test/androidtestinitializer.h"
35 #endif 35 #endif
36 #include "talk/app/webrtc/test/fakedtlsidentitystore.h" 36 #include "webrtc/api/test/fakedtlsidentitystore.h"
37 #include "talk/app/webrtc/test/fakevideotrackrenderer.h" 37 #include "webrtc/api/test/fakevideotrackrenderer.h"
38 #include "talk/app/webrtc/videosourceinterface.h" 38 #include "webrtc/api/videosourceinterface.h"
39 #include "webrtc/base/gunit.h" 39 #include "webrtc/base/gunit.h"
40 #include "webrtc/base/scoped_ptr.h" 40 #include "webrtc/base/scoped_ptr.h"
41 #include "webrtc/base/thread.h" 41 #include "webrtc/base/thread.h"
42 #include "webrtc/media/base/fakevideocapturer.h" 42 #include "webrtc/media/base/fakevideocapturer.h"
43 #include "webrtc/media/webrtc/webrtccommon.h" 43 #include "webrtc/media/webrtc/webrtccommon.h"
44 #include "webrtc/media/webrtc/webrtcvoe.h" 44 #include "webrtc/media/webrtc/webrtcvoe.h"
45 #include "webrtc/p2p/client/fakeportallocator.h" 45 #include "webrtc/p2p/client/fakeportallocator.h"
46 46
47 using webrtc::DataChannelInterface; 47 using webrtc::DataChannelInterface;
48 using webrtc::DtlsIdentityStoreInterface; 48 using webrtc::DtlsIdentityStoreInterface;
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 track->set_enabled(false); 365 track->set_enabled(false);
366 EXPECT_TRUE(capturer->CaptureFrame()); 366 EXPECT_TRUE(capturer->CaptureFrame());
367 EXPECT_EQ(2, local_renderer.num_rendered_frames()); 367 EXPECT_EQ(2, local_renderer.num_rendered_frames());
368 EXPECT_TRUE(local_renderer.black_frame()); 368 EXPECT_TRUE(local_renderer.black_frame());
369 369
370 track->set_enabled(true); 370 track->set_enabled(true);
371 EXPECT_TRUE(capturer->CaptureFrame()); 371 EXPECT_TRUE(capturer->CaptureFrame());
372 EXPECT_EQ(3, local_renderer.num_rendered_frames()); 372 EXPECT_EQ(3, local_renderer.num_rendered_frames());
373 EXPECT_FALSE(local_renderer.black_frame()); 373 EXPECT_FALSE(local_renderer.black_frame());
374 } 374 }
OLDNEW
« no previous file with comments | « webrtc/api/peerconnectionfactory.cc ('k') | webrtc/api/peerconnectionfactoryproxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698