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

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

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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/pc/peerconnectionfactory.cc ('k') | webrtc/pc/peerconnectioninterface_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 * 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
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 #include <utility> 13 #include <utility>
14 14
15 #include "webrtc/api/mediastreaminterface.h" 15 #include "webrtc/api/mediastreaminterface.h"
16 #include "webrtc/base/gunit.h"
17 #include "webrtc/base/thread.h"
18 #include "webrtc/media/base/fakevideocapturer.h" 16 #include "webrtc/media/base/fakevideocapturer.h"
19 #include "webrtc/media/engine/webrtccommon.h" 17 #include "webrtc/media/engine/webrtccommon.h"
20 #include "webrtc/media/engine/webrtcvoe.h" 18 #include "webrtc/media/engine/webrtcvoe.h"
21 #include "webrtc/p2p/base/fakeportallocator.h" 19 #include "webrtc/p2p/base/fakeportallocator.h"
22 #include "webrtc/pc/peerconnectionfactory.h" 20 #include "webrtc/pc/peerconnectionfactory.h"
21 #include "webrtc/rtc_base/gunit.h"
22 #include "webrtc/rtc_base/thread.h"
23 #ifdef WEBRTC_ANDROID 23 #ifdef WEBRTC_ANDROID
24 #include "webrtc/pc/test/androidtestinitializer.h" 24 #include "webrtc/pc/test/androidtestinitializer.h"
25 #endif 25 #endif
26 #include "webrtc/pc/test/fakertccertificategenerator.h" 26 #include "webrtc/pc/test/fakertccertificategenerator.h"
27 #include "webrtc/pc/test/fakevideotrackrenderer.h" 27 #include "webrtc/pc/test/fakevideotrackrenderer.h"
28 28
29 using webrtc::DataChannelInterface; 29 using webrtc::DataChannelInterface;
30 using webrtc::FakeVideoTrackRenderer; 30 using webrtc::FakeVideoTrackRenderer;
31 using webrtc::MediaStreamInterface; 31 using webrtc::MediaStreamInterface;
32 using webrtc::PeerConnectionFactoryInterface; 32 using webrtc::PeerConnectionFactoryInterface;
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 track->set_enabled(false); 348 track->set_enabled(false);
349 EXPECT_TRUE(capturer->CaptureFrame()); 349 EXPECT_TRUE(capturer->CaptureFrame());
350 EXPECT_EQ(2, local_renderer.num_rendered_frames()); 350 EXPECT_EQ(2, local_renderer.num_rendered_frames());
351 EXPECT_TRUE(local_renderer.black_frame()); 351 EXPECT_TRUE(local_renderer.black_frame());
352 352
353 track->set_enabled(true); 353 track->set_enabled(true);
354 EXPECT_TRUE(capturer->CaptureFrame()); 354 EXPECT_TRUE(capturer->CaptureFrame());
355 EXPECT_EQ(3, local_renderer.num_rendered_frames()); 355 EXPECT_EQ(3, local_renderer.num_rendered_frames());
356 EXPECT_FALSE(local_renderer.black_frame()); 356 EXPECT_FALSE(local_renderer.black_frame());
357 } 357 }
OLDNEW
« no previous file with comments | « webrtc/pc/peerconnectionfactory.cc ('k') | webrtc/pc/peerconnectioninterface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698