Removes uptr alias in network control code.
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}diff --git a/modules/congestion_controller/goog_cc/goog_cc_factory.cc b/modules/congestion_controller/goog_cc/goog_cc_factory.cc
index b8ed786..c18317f 100644
--- a/modules/congestion_controller/goog_cc/goog_cc_factory.cc
+++ b/modules/congestion_controller/goog_cc/goog_cc_factory.cc
@@ -17,8 +17,8 @@
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);
}
diff --git a/modules/congestion_controller/goog_cc/include/goog_cc_factory.h b/modules/congestion_controller/goog_cc/include/goog_cc_factory.h
index 37fbe1a..29555a1 100644
--- a/modules/congestion_controller/goog_cc/include/goog_cc_factory.h
+++ b/modules/congestion_controller/goog_cc/include/goog_cc_factory.h
@@ -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 @@
: public NetworkControllerFactoryInterface {
public:
explicit GoogCcNetworkControllerFactory(RtcEventLog*);
- NetworkControllerInterface::uptr Create(
+ std::unique_ptr<NetworkControllerInterface> Create(
NetworkControllerConfig config) override;
TimeDelta GetProcessInterval() const override;
diff --git a/modules/congestion_controller/network_control/include/network_control.h b/modules/congestion_controller/network_control/include/network_control.h
index 13d7c9d..cf598c3 100644
--- a/modules/congestion_controller/network_control/include/network_control.h
+++ b/modules/congestion_controller/network_control/include/network_control.h
@@ -47,7 +47,6 @@
// non-concurrent fashion.
class NetworkControllerInterface {
public:
- using uptr = std::unique_ptr<NetworkControllerInterface>;
virtual ~NetworkControllerInterface() = default;
// Called when network availabilty changes.
@@ -79,10 +78,9 @@
// 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.