Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(612)

Unified Diff: components/wifi/wifi_service_mac.mm

Issue 1917673002: Convert //components/[u-z]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/wifi/wifi_service.h ('k') | components/wifi/wifi_service_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/wifi/wifi_service_mac.mm
diff --git a/components/wifi/wifi_service_mac.mm b/components/wifi/wifi_service_mac.mm
index ea2961c4e774d277ca5c7f00151c3dea2b8ca4f3..17ee60cf6d8952ecbfc961a95b84fe183e70e424 100644
--- a/components/wifi/wifi_service_mac.mm
+++ b/components/wifi/wifi_service_mac.mm
@@ -47,11 +47,11 @@ class WiFiServiceMac : public WiFiService {
std::string* error) override;
void SetProperties(const std::string& network_guid,
- scoped_ptr<base::DictionaryValue> properties,
+ std::unique_ptr<base::DictionaryValue> properties,
std::string* error) override;
void CreateNetwork(bool shared,
- scoped_ptr<base::DictionaryValue> properties,
+ std::unique_ptr<base::DictionaryValue> properties,
std::string* network_guid,
std::string* error) override;
@@ -192,7 +192,7 @@ void WiFiServiceMac::GetProperties(const std::string& network_guid,
}
it->connection_state = GetNetworkConnectionState(network_guid);
- scoped_ptr<base::DictionaryValue> network(it->ToValue(false));
+ std::unique_ptr<base::DictionaryValue> network(it->ToValue(false));
properties->Swap(network.get());
DVLOG(1) << *properties;
}
@@ -212,7 +212,7 @@ void WiFiServiceMac::GetState(const std::string& network_guid,
void WiFiServiceMac::SetProperties(
const std::string& network_guid,
- scoped_ptr<base::DictionaryValue> properties,
+ std::unique_ptr<base::DictionaryValue> properties,
std::string* error) {
base::DictionaryValue* existing_properties;
// If the network properties already exist, don't override previously set
@@ -228,7 +228,7 @@ void WiFiServiceMac::SetProperties(
void WiFiServiceMac::CreateNetwork(
bool shared,
- scoped_ptr<base::DictionaryValue> properties,
+ std::unique_ptr<base::DictionaryValue> properties,
std::string* network_guid,
std::string* error) {
NetworkProperties network_properties;
@@ -262,7 +262,8 @@ void WiFiServiceMac::GetVisibleNetworks(const std::string& network_type,
for (NetworkList::const_iterator it = networks_.begin();
it != networks_.end();
++it) {
- scoped_ptr<base::DictionaryValue> network(it->ToValue(!include_details));
+ std::unique_ptr<base::DictionaryValue> network(
+ it->ToValue(!include_details));
network_list->Append(network.release());
}
}
« no previous file with comments | « components/wifi/wifi_service.h ('k') | components/wifi/wifi_service_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698