239ac8a4e2
This is a reland of 003c9be817817ed0e3aef3f50c78ae5cb31bc0ff Found some downstream code that relies on NetworkMonitorFactory::SetFactory, so I'm adding those methods back temporarily. BasicNetworkManager will fall back to the static factory if the one passed into PeerConnectionFactory is null. Original change's description: > Pass NetworkMonitorFactory through PeerConnectionFactory. > > Previously the instance was set through a static method, which was > really only done because it was difficult to add new > PeerConnectionFactory construction arguments at the time. > > Now that we have PeerConnectionFactoryDependencies it's easy to clean > this up. > > I'm doing this because I plan to add a NetworkMonitor implementation > for iOS, and don't want to inherit this ugliness. > > Bug: webrtc:9883 > Change-Id: Id94dc061ab1c7186b81af8547393a6e336ff04c2 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180241 > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > Commit-Queue: Taylor <deadbeef@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#31815} TBR=hta@webrtc.org, sakal@webrtc.org Bug: webrtc:9883 Change-Id: I2e817c423f21936f87532a9694eb9a0a1b70c212 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180722 Reviewed-by: Taylor <deadbeef@webrtc.org> Commit-Queue: Taylor <deadbeef@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31824}
43 lines
1.3 KiB
C++
43 lines
1.3 KiB
C++
/*
|
|
* Copyright 2020 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "rtc_base/network_monitor_factory.h"
|
|
|
|
namespace {
|
|
// This is set by NetworkMonitorFactory::SetFactory and the caller of
|
|
// NetworkMonitorFactory::SetFactory must be responsible for calling
|
|
// ReleaseFactory to destroy the factory.
|
|
rtc::NetworkMonitorFactory* network_monitor_factory = nullptr;
|
|
} // namespace
|
|
|
|
namespace rtc {
|
|
|
|
NetworkMonitorFactory::NetworkMonitorFactory() {}
|
|
NetworkMonitorFactory::~NetworkMonitorFactory() {}
|
|
|
|
void NetworkMonitorFactory::SetFactory(NetworkMonitorFactory* factory) {
|
|
if (network_monitor_factory != nullptr) {
|
|
delete network_monitor_factory;
|
|
}
|
|
network_monitor_factory = factory;
|
|
}
|
|
|
|
void NetworkMonitorFactory::ReleaseFactory(NetworkMonitorFactory* factory) {
|
|
if (factory == network_monitor_factory) {
|
|
SetFactory(nullptr);
|
|
}
|
|
}
|
|
|
|
NetworkMonitorFactory* NetworkMonitorFactory::GetFactory() {
|
|
return network_monitor_factory;
|
|
}
|
|
|
|
} // namespace rtc
|