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

Side by Side Diff: talk/app/webrtc/peerconnectionfactory_unittest.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rename back test to libjingle_media_unittest Created 4 years, 11 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
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 18 matching lines...) Expand all
29 #include <utility> 29 #include <utility>
30 30
31 #include "talk/app/webrtc/mediastreaminterface.h" 31 #include "talk/app/webrtc/mediastreaminterface.h"
32 #include "talk/app/webrtc/peerconnectionfactory.h" 32 #include "talk/app/webrtc/peerconnectionfactory.h"
33 #ifdef WEBRTC_ANDROID 33 #ifdef WEBRTC_ANDROID
34 #include "talk/app/webrtc/test/androidtestinitializer.h" 34 #include "talk/app/webrtc/test/androidtestinitializer.h"
35 #endif 35 #endif
36 #include "talk/app/webrtc/test/fakedtlsidentitystore.h" 36 #include "talk/app/webrtc/test/fakedtlsidentitystore.h"
37 #include "talk/app/webrtc/test/fakevideotrackrenderer.h" 37 #include "talk/app/webrtc/test/fakevideotrackrenderer.h"
38 #include "talk/app/webrtc/videosourceinterface.h" 38 #include "talk/app/webrtc/videosourceinterface.h"
39 #include "talk/media/base/fakevideocapturer.h"
40 #include "talk/media/webrtc/webrtccommon.h"
41 #include "talk/media/webrtc/webrtcvoe.h"
42 #include "webrtc/base/gunit.h" 39 #include "webrtc/base/gunit.h"
43 #include "webrtc/base/scoped_ptr.h" 40 #include "webrtc/base/scoped_ptr.h"
44 #include "webrtc/base/thread.h" 41 #include "webrtc/base/thread.h"
42 #include "webrtc/media/base/fakevideocapturer.h"
43 #include "webrtc/media/webrtc/webrtccommon.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;
49 using webrtc::FakeVideoTrackRenderer; 49 using webrtc::FakeVideoTrackRenderer;
50 using webrtc::MediaStreamInterface; 50 using webrtc::MediaStreamInterface;
51 using webrtc::PeerConnectionFactoryInterface; 51 using webrtc::PeerConnectionFactoryInterface;
52 using webrtc::PeerConnectionInterface; 52 using webrtc::PeerConnectionInterface;
53 using webrtc::PeerConnectionObserver; 53 using webrtc::PeerConnectionObserver;
54 using webrtc::VideoSourceInterface; 54 using webrtc::VideoSourceInterface;
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 363
364 track->set_enabled(false); 364 track->set_enabled(false);
365 EXPECT_TRUE(capturer->CaptureFrame()); 365 EXPECT_TRUE(capturer->CaptureFrame());
366 EXPECT_EQ(1, local_renderer.num_rendered_frames()); 366 EXPECT_EQ(1, local_renderer.num_rendered_frames());
367 367
368 track->set_enabled(true); 368 track->set_enabled(true);
369 EXPECT_TRUE(capturer->CaptureFrame()); 369 EXPECT_TRUE(capturer->CaptureFrame());
370 EXPECT_EQ(2, local_renderer.num_rendered_frames()); 370 EXPECT_EQ(2, local_renderer.num_rendered_frames());
371 } 371 }
372 372
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698