From 341bfca58cb1fea6fa17334ccf733223961bdbbd Mon Sep 17 00:00:00 2001
From: Sebastian Jansson <srte@webrtc.org>
Date: Thu, 3 May 2018 11:18:32 +0200
Subject: [PATCH] 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}
---
 modules/congestion_controller/goog_cc/goog_cc_factory.cc      | 4 ++--
 .../congestion_controller/goog_cc/include/goog_cc_factory.h   | 4 +++-
 .../network_control/include/network_control.h                 | 4 +---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/congestion_controller/goog_cc/goog_cc_factory.cc b/modules/congestion_controller/goog_cc/goog_cc_factory.cc
index b8ed7862df..c18317fd19 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 @@ 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);
 }
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 37fbe1ab7c..29555a1afd 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 @@ class GoogCcNetworkControllerFactory
     : 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 13d7c9df08..cf598c3d0e 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 @@ 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.