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

Removes uptr alias in network control code.

Browse Source 
Bug: webrtc:9155
Change-Id: Ia3b79642a9477d9357a289f8f14bd2f53bc52e2e
Reviewed-on: https://webrtc-review.googlesource.com/73371
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23098}
This commit is contained in:
Sebastian Jansson
2018-05-03 11:18:32 +02:00
committed by Commit Bot
parent 9a0a935460
commit 341bfca58c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/congestion_controller/goog_cc/goog_cc_factory.cc
View File

@ -17,8 +17,8 @@ GoogCcNetworkControllerFactory::GoogCcNetworkControllerFactory(
RtcEventLog* event_log)
: event_log_(event_log) {}
NetworkControllerInterface::uptr GoogCcNetworkControllerFactory::Create(
NetworkControllerConfig config) {
std::unique_ptr<NetworkControllerInterface>
GoogCcNetworkControllerFactory::Create(NetworkControllerConfig config) {
return rtc::MakeUnique<webrtc_cc::GoogCcNetworkController>(event_log_,
config);
}

4
modules/congestion_controller/goog_cc/include/goog_cc_factory.h
View File

@ -10,6 +10,8 @@
#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_INCLUDE_GOOG_CC_FACTORY_H_
#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_INCLUDE_GOOG_CC_FACTORY_H_
#include <memory>
#include "modules/congestion_controller/network_control/include/network_control.h"
namespace webrtc {
@ -20,7 +22,7 @@ class GoogCcNetworkControllerFactory
: public NetworkControllerFactoryInterface {
public:
explicit GoogCcNetworkControllerFactory(RtcEventLog*);
NetworkControllerInterface::uptr Create(
std::unique_ptr<NetworkControllerInterface> Create(
NetworkControllerConfig config) override;
TimeDelta GetProcessInterval() const override;

4
modules/congestion_controller/network_control/include/network_control.h
View File

@ -47,7 +47,6 @@ struct NetworkControllerConfig {
// non-concurrent fashion.
class NetworkControllerInterface {
public:
using uptr = std::unique_ptr<NetworkControllerInterface>;
virtual ~NetworkControllerInterface() = default;
// Called when network availabilty changes.
@ -79,10 +78,9 @@ class NetworkControllerInterface {
// controller.
class NetworkControllerFactoryInterface {
public:
using uptr = std::unique_ptr<NetworkControllerFactoryInterface>;
// Used to create a new network controller, requires an observer to be
// provided to handle callbacks.
virtual NetworkControllerInterface::uptr Create(
virtual std::unique_ptr<NetworkControllerInterface> Create(
NetworkControllerConfig config) = 0;
// Returns the interval by which the network controller expects
// OnProcessInterval calls.