| Index: extensions/browser/api/vpn_provider/vpn_provider_api.cc
|
| diff --git a/extensions/browser/api/vpn_provider/vpn_provider_api.cc b/extensions/browser/api/vpn_provider/vpn_provider_api.cc
|
| index 601835db0763c4bf60b8f5009f7dba6a54e6551d..5856f3deff579176a8024bdef2d7f4b86773fabc 100644
|
| --- a/extensions/browser/api/vpn_provider/vpn_provider_api.cc
|
| +++ b/extensions/browser/api/vpn_provider/vpn_provider_api.cc
|
| @@ -4,11 +4,11 @@
|
|
|
| #include "extensions/browser/api/vpn_provider/vpn_provider_api.h"
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/bind.h"
|
| #include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string_split.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/values.h"
|
| @@ -189,7 +189,7 @@ VpnProviderCreateConfigFunction::~VpnProviderCreateConfigFunction() {
|
| }
|
|
|
| ExtensionFunction::ResponseAction VpnProviderCreateConfigFunction::Run() {
|
| - scoped_ptr<api_vpn::CreateConfig::Params> params(
|
| + std::unique_ptr<api_vpn::CreateConfig::Params> params(
|
| api_vpn::CreateConfig::Params::Create(*args_));
|
| if (!params) {
|
| return RespondNow(Error("Invalid arguments."));
|
| @@ -219,7 +219,7 @@ VpnProviderDestroyConfigFunction::~VpnProviderDestroyConfigFunction() {
|
| }
|
|
|
| ExtensionFunction::ResponseAction VpnProviderDestroyConfigFunction::Run() {
|
| - scoped_ptr<api_vpn::DestroyConfig::Params> params(
|
| + std::unique_ptr<api_vpn::DestroyConfig::Params> params(
|
| api_vpn::DestroyConfig::Params::Create(*args_));
|
| if (!params) {
|
| return RespondNow(Error("Invalid arguments."));
|
| @@ -246,7 +246,7 @@ VpnProviderSetParametersFunction::~VpnProviderSetParametersFunction() {
|
| }
|
|
|
| ExtensionFunction::ResponseAction VpnProviderSetParametersFunction::Run() {
|
| - scoped_ptr<api_vpn::SetParameters::Params> params(
|
| + std::unique_ptr<api_vpn::SetParameters::Params> params(
|
| api_vpn::SetParameters::Params::Create(*args_));
|
| if (!params) {
|
| return RespondNow(Error("Invalid arguments."));
|
| @@ -281,7 +281,7 @@ VpnProviderSendPacketFunction::~VpnProviderSendPacketFunction() {
|
| }
|
|
|
| ExtensionFunction::ResponseAction VpnProviderSendPacketFunction::Run() {
|
| - scoped_ptr<api_vpn::SendPacket::Params> params(
|
| + std::unique_ptr<api_vpn::SendPacket::Params> params(
|
| api_vpn::SendPacket::Params::Create(*args_));
|
| if (!params) {
|
| return RespondNow(Error("Invalid arguments."));
|
| @@ -310,7 +310,7 @@ VpnProviderNotifyConnectionStateChangedFunction::
|
|
|
| ExtensionFunction::ResponseAction
|
| VpnProviderNotifyConnectionStateChangedFunction::Run() {
|
| - scoped_ptr<api_vpn::NotifyConnectionStateChanged::Params> params(
|
| + std::unique_ptr<api_vpn::NotifyConnectionStateChanged::Params> params(
|
| api_vpn::NotifyConnectionStateChanged::Params::Create(*args_));
|
| if (!params) {
|
| return RespondNow(Error("Invalid arguments."));
|
|
|