zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland "Use the new DNS resolver API in PeerConnection"

Browse Source 
This reverts commit 5a40b3710545edfd8a634341df3de26f57d79281.

Reason for revert: Fixed the bug and ran layout tests.

Original change's description:
> Revert "Use the new DNS resolver API in PeerConnection"
>
> This reverts commit acf8ccb3c9f001b0ed749aca52b2d436d66f9586.
>
> Reason for revert: Speculative revert for https://ci.chromium.org/ui/p/chromium/builders/try/win10_chromium_x64_rel_ng/b8851745102358680592/overview.
>
> Original change's description:
> > Use the new DNS resolver API in PeerConnection
> >
> > Bug: webrtc:12598
> > Change-Id: I5a14058e7f28c993ed927749df7357c715ba83fb
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/212961
> > Reviewed-by: Niels Moller <nisse@webrtc.org>
> > Commit-Queue: Harald Alvestrand <hta@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#33561}
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> TBR=hta@webrtc.org
>
> Bug: webrtc:12598
> Change-Id: Idc9853cb569849c49052f9cbd865614710fff979
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/213188
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#33591}

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: webrtc:12598
Change-Id: Ief7867f2f23de66504877cdab1b23a11df2d5de4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/214120
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33647}
This commit is contained in:
Harald Alvestrand
2021-04-08 07:25:04 +00:00
committed by Commit Bot
parent 11bd143974
commit 0ccfbd2de7
20 changed files with 517 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
p2p/base/basic_async_resolver_factory_unittest.cc
View File

@ -10,10 +10,15 @@
#include "p2p/base/basic_async_resolver_factory.h"
#include "api/test/mock_async_dns_resolver.h"
#include "p2p/base/mock_async_resolver.h"
#include "rtc_base/async_resolver.h"
#include "rtc_base/gunit.h"
#include "rtc_base/socket_address.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "test/gmock.h"
#include "test/gtest.h"
#include "test/testsupport/rtc_expect_death.h"
namespace webrtc {
@ -47,7 +52,7 @@ TEST_F(BasicAsyncResolverFactoryTest, TestCreate) {
TestCreate();
}
TEST(WrappingAsyncDnsResolverFactoryTest, TestCreate) {
TEST(WrappingAsyncDnsResolverFactoryTest, TestCreateAndResolve) {
WrappingAsyncDnsResolverFactory factory(
std::make_unique<BasicAsyncResolverFactory>());
@ -61,4 +66,24 @@ TEST(WrappingAsyncDnsResolverFactoryTest, TestCreate) {
resolver.reset();
}
TEST(WrappingAsyncDnsResolverFactoryTest, WrapOtherResolver) {
BasicAsyncResolverFactory non_owned_factory;
WrappingAsyncDnsResolverFactory factory(&non_owned_factory);
std::unique_ptr<AsyncDnsResolverInterface> resolver(factory.Create());
ASSERT_TRUE(resolver);
bool address_resolved = false;
rtc::SocketAddress address("", 0);
resolver->Start(address, [&address_resolved]() { address_resolved = true; });
ASSERT_TRUE_WAIT(address_resolved, 10000 /*ms*/);
resolver.reset();
}
void CallResolver(WrappingAsyncDnsResolverFactory& factory) {
rtc::SocketAddress address("", 0);
std::unique_ptr<AsyncDnsResolverInterface> resolver(factory.Create());
resolver->Start(address, [&resolver]() { resolver.reset(); });
WAIT(!resolver.get(), 10000 /*ms*/);
}
} // namespace webrtc