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: webrtc/pc/peerconnectionendtoend_unittest.cc

Issue 2869863003: Remove temporary include of builtin_audio_encoder_factory.h. (Closed)
Patch Set: Created 3 years, 7 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/peerconnectioninterface.h ('k') | webrtc/pc/rtcstats_integrationtest.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 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2013 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 12
13 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" 13 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
14 #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
14 #include "webrtc/base/gunit.h" 15 #include "webrtc/base/gunit.h"
15 #include "webrtc/base/logging.h" 16 #include "webrtc/base/logging.h"
16 #include "webrtc/base/ptr_util.h" 17 #include "webrtc/base/ptr_util.h"
17 #include "webrtc/base/ssladapter.h" 18 #include "webrtc/base/ssladapter.h"
18 #include "webrtc/base/sslstreamadapter.h" 19 #include "webrtc/base/sslstreamadapter.h"
19 #include "webrtc/base/stringencode.h" 20 #include "webrtc/base/stringencode.h"
20 #include "webrtc/base/stringutils.h" 21 #include "webrtc/base/stringutils.h"
21 #include "webrtc/base/thread.h" 22 #include "webrtc/base/thread.h"
22 #ifdef WEBRTC_ANDROID 23 #ifdef WEBRTC_ANDROID
23 #include "webrtc/pc/test/androidtestinitializer.h" 24 #include "webrtc/pc/test/androidtestinitializer.h"
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 // This removes the reference to the remote data channel that we hold. 538 // This removes the reference to the remote data channel that we hold.
538 callee_signaled_data_channels_.clear(); 539 callee_signaled_data_channels_.clear();
539 caller_dc->Close(); 540 caller_dc->Close();
540 EXPECT_EQ_WAIT(DataChannelInterface::kClosed, caller_dc->state(), kMaxWait); 541 EXPECT_EQ_WAIT(DataChannelInterface::kClosed, caller_dc->state(), kMaxWait);
541 542
542 // Wait for a bit longer so the remote data channel will receive the 543 // Wait for a bit longer so the remote data channel will receive the
543 // close message and be destroyed. 544 // close message and be destroyed.
544 rtc::Thread::Current()->ProcessMessages(100); 545 rtc::Thread::Current()->ProcessMessages(100);
545 } 546 }
546 #endif // HAVE_SCTP 547 #endif // HAVE_SCTP
OLDNEW
« no previous file with comments | « webrtc/api/peerconnectioninterface.h ('k') | webrtc/pc/rtcstats_integrationtest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698