diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/net/base/network_interfaces_posix.cc | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/base/network_interfaces_posix.cc')
| -rw-r--r-- | chromium/net/base/network_interfaces_posix.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/net/base/network_interfaces_posix.cc b/chromium/net/base/network_interfaces_posix.cc index 513c310b6f9..37f2d597e91 100644 --- a/chromium/net/base/network_interfaces_posix.cc +++ b/chromium/net/base/network_interfaces_posix.cc @@ -4,10 +4,10 @@ #include "net/base/network_interfaces.h" -#include <set> #include <sys/types.h> -#include "base/memory/scoped_ptr.h" +#include <memory> +#include <set> #if !defined(OS_NACL) #include "net/base/network_interfaces_posix.h" @@ -74,8 +74,8 @@ WifiPHYLayerProtocol GetWifiPHYLayerProtocol() { return WIFI_PHY_LAYER_PROTOCOL_UNKNOWN; } -scoped_ptr<ScopedWifiOptions> SetWifiOptions(int options) { - return scoped_ptr<ScopedWifiOptions>(); +std::unique_ptr<ScopedWifiOptions> SetWifiOptions(int options) { + return std::unique_ptr<ScopedWifiOptions>(); } |