Index: chrome/browser/extensions/api/gcd_private/gcd_private_api.cc |
diff --git a/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc b/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc |
index c0844f6f9c2239c92d82616abe26d5f600c333cc..f9c7d427e89eecc1d16a180a7ff75b4576ca321f 100644 |
--- a/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc |
+++ b/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc |
@@ -73,7 +73,7 @@ class GcdPrivateAPIImpl { |
void RemoveSession(int session_id); |
void RemoveSessionDelayed(int session_id); |
- scoped_ptr<base::ListValue> GetPrefetchedSSIDList(); |
+ std::unique_ptr<base::ListValue> GetPrefetchedSSIDList(); |
private: |
typedef std::map<std::string /* ssid */, std::string /* password */> |
@@ -179,7 +179,7 @@ void GcdPrivateAPIImpl::SendMessage(int session_id, |
const base::DictionaryValue& input, |
const MessageResponseCallback& callback) { |
const base::DictionaryValue* input_actual = &input; |
- scoped_ptr<base::DictionaryValue> input_cloned; |
+ std::unique_ptr<base::DictionaryValue> input_cloned; |
if (api == kPrivatAPISetup) { |
const base::DictionaryValue* wifi = NULL; |
@@ -221,8 +221,8 @@ void GcdPrivateAPIImpl::RemoveSessionDelayed(int session_id) { |
weak_ptr_factory_.GetWeakPtr(), session_id)); |
} |
-scoped_ptr<base::ListValue> GcdPrivateAPIImpl::GetPrefetchedSSIDList() { |
- scoped_ptr<base::ListValue> retval(new base::ListValue); |
+std::unique_ptr<base::ListValue> GcdPrivateAPIImpl::GetPrefetchedSSIDList() { |
+ std::unique_ptr<base::ListValue> retval(new base::ListValue); |
return retval; |
} |
@@ -249,7 +249,7 @@ GcdPrivateGetDeviceInfoFunction::~GcdPrivateGetDeviceInfoFunction() { |
} |
bool GcdPrivateGetDeviceInfoFunction::RunAsync() { |
- scoped_ptr<gcd_private::CreateSession::Params> params = |
+ std::unique_ptr<gcd_private::CreateSession::Params> params = |
gcd_private::CreateSession::Params::Create(*args_); |
if (!params) |
@@ -285,7 +285,7 @@ GcdPrivateCreateSessionFunction::~GcdPrivateCreateSessionFunction() { |
} |
bool GcdPrivateCreateSessionFunction::RunAsync() { |
- scoped_ptr<gcd_private::CreateSession::Params> params = |
+ std::unique_ptr<gcd_private::CreateSession::Params> params = |
gcd_private::CreateSession::Params::Create(*args_); |
if (!params) |
@@ -336,7 +336,7 @@ GcdPrivateStartPairingFunction::~GcdPrivateStartPairingFunction() { |
} |
bool GcdPrivateStartPairingFunction::RunAsync() { |
- scoped_ptr<gcd_private::StartPairing::Params> params = |
+ std::unique_ptr<gcd_private::StartPairing::Params> params = |
gcd_private::StartPairing::Params::Create(*args_); |
if (!params) |
@@ -364,7 +364,7 @@ GcdPrivateConfirmCodeFunction::~GcdPrivateConfirmCodeFunction() { |
} |
bool GcdPrivateConfirmCodeFunction::RunAsync() { |
- scoped_ptr<gcd_private::ConfirmCode::Params> params = |
+ std::unique_ptr<gcd_private::ConfirmCode::Params> params = |
gcd_private::ConfirmCode::Params::Create(*args_); |
if (!params) |
@@ -392,7 +392,7 @@ GcdPrivateSendMessageFunction::~GcdPrivateSendMessageFunction() { |
} |
bool GcdPrivateSendMessageFunction::RunAsync() { |
- scoped_ptr<gcd_private::PassMessage::Params> params = |
+ std::unique_ptr<gcd_private::PassMessage::Params> params = |
gcd_private::PassMessage::Params::Create(*args_); |
if (!params) |
@@ -427,7 +427,7 @@ GcdPrivateTerminateSessionFunction::~GcdPrivateTerminateSessionFunction() { |
} |
bool GcdPrivateTerminateSessionFunction::RunAsync() { |
- scoped_ptr<gcd_private::TerminateSession::Params> params = |
+ std::unique_ptr<gcd_private::TerminateSession::Params> params = |
gcd_private::TerminateSession::Params::Create(*args_); |
if (!params) |