Replace scoped_ptr with std::unique_ptr in //ui

ui/chromeos/network/network_connect.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/chromeos/network/network_connect.h"
 
+#include <memory>
+
 #include "base/bind.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/device_state.h"
 #include "chromeos/network/network_activation_handler.h"
 #include "chromeos/network/network_configuration_handler.h"
 #include "chromeos/network/network_connection_handler.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_handler_callbacks.h"
@@ skipping 58 matching lines @@
   void CreateConfiguration(base::DictionaryValue* shill_properties,
                            bool shared) override;
   base::string16 GetShillErrorString(const std::string& error,
                                      const std::string& service_path) override;
   void ShowNetworkSettingsForPath(const std::string& service_path) override;
 
  private:
   void HandleUnconfiguredNetwork(const std::string& service_path);
   void OnConnectFailed(const std::string& service_path,
                        const std::string& error_name,
-                       scoped_ptr<base::DictionaryValue> error_data);
+                       std::unique_ptr<base::DictionaryValue> error_data);
   bool MaybeShowConfigureUIImpl(const std::string& service_path,
                                 const std::string& connect_error);
   bool GetNetworkProfilePath(bool shared, std::string* profile_path);
   void OnConnectSucceeded(const std::string& service_path);
   void CallConnectToNetwork(const std::string& service_path,
                             bool check_error_state);
   void OnActivateFailed(const std::string& service_path,
                         const std::string& error_name,
-                        scoped_ptr<base::DictionaryValue> error_data);
+                        std::unique_ptr<base::DictionaryValue> error_data);
   void OnActivateSucceeded(const std::string& service_path);
   void OnConfigureFailed(const std::string& error_name,
-                         scoped_ptr<base::DictionaryValue> error_data);
+                         std::unique_ptr<base::DictionaryValue> error_data);
   void OnConfigureSucceeded(bool connect_on_configure,
                             const std::string& service_path,
                             const std::string& guid);
   void CallCreateConfiguration(base::DictionaryValue* properties,
                                bool shared,
                                bool connect_on_configure);
   void SetPropertiesFailed(const std::string& desc,
                            const std::string& service_path,
                            const std::string& config_error_name,
-                           scoped_ptr<base::DictionaryValue> error_data);
+                           std::unique_ptr<base::DictionaryValue> error_data);
   void SetPropertiesToClear(base::DictionaryValue* properties_to_set,
                             std::vector<std::string>* properties_to_clear);
   void ClearPropertiesAndConnect(
       const std::string& service_path,
       const std::vector<std::string>& properties_to_clear);
   void ConfigureSetProfileSucceeded(
       const std::string& service_path,
-      scoped_ptr<base::DictionaryValue> properties_to_set);
+      std::unique_ptr<base::DictionaryValue> properties_to_set);
 
   Delegate* delegate_;
-  scoped_ptr<NetworkStateNotifier> network_state_notifier_;
+  std::unique_ptr<NetworkStateNotifier> network_state_notifier_;
   base::WeakPtrFactory<NetworkConnectImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkConnectImpl);
 };
 
 NetworkConnectImpl::NetworkConnectImpl(Delegate* delegate)
     : delegate_(delegate), weak_factory_(this) {
   network_state_notifier_.reset(new NetworkStateNotifier(this));
 }
 
@@ skipping 68 matching lines @@
     return false;
   }
 
   *profile_path = profile->path;
   return true;
 }
 
 void NetworkConnectImpl::OnConnectFailed(
     const std::string& service_path,
     const std::string& error_name,
-    scoped_ptr<base::DictionaryValue> error_data) {
+    std::unique_ptr<base::DictionaryValue> error_data) {
   MaybeShowConfigureUIImpl(service_path, error_name);
 }
 
 // This handles connect failures that are a direct result of a user initiated
 // connect request and result in a new UI being shown. Note: notifications are
 // handled by NetworkStateNotifier.
 bool NetworkConnectImpl::MaybeShowConfigureUIImpl(
     const std::string& service_path,
     const std::string& connect_error) {
   NET_LOG_ERROR("Connect Failed: " + connect_error, service_path);
@@ skipping 38 matching lines @@
       service_path, base::Bind(&NetworkConnectImpl::OnConnectSucceeded,
                                weak_factory_.GetWeakPtr(), service_path),
       base::Bind(&NetworkConnectImpl::OnConnectFailed,
                  weak_factory_.GetWeakPtr(), service_path),
       check_error_state);
 }
 
 void NetworkConnectImpl::OnActivateFailed(
     const std::string& service_path,
     const std::string& error_name,
-    scoped_ptr<base::DictionaryValue> error_data) {
+    std::unique_ptr<base::DictionaryValue> error_data) {
   NET_LOG_ERROR("Unable to activate network", service_path);
   network_state_notifier_->ShowNetworkConnectError(kErrorActivateFailed,
                                                    service_path);
 }
 
 void NetworkConnectImpl::OnActivateSucceeded(const std::string& service_path) {
   NET_LOG_USER("Activation Succeeded", service_path);
 }
 
 void NetworkConnectImpl::OnConfigureFailed(
     const std::string& error_name,
-    scoped_ptr<base::DictionaryValue> error_data) {
+    std::unique_ptr<base::DictionaryValue> error_data) {
   NET_LOG_ERROR("Unable to configure network", "");
   network_state_notifier_->ShowNetworkConnectError(
       NetworkConnectionHandler::kErrorConfigureFailed, "");
 }
 
 void NetworkConnectImpl::OnConfigureSucceeded(bool connect_on_configure,
                                               const std::string& service_path,
                                               const std::string& guid) {
   NET_LOG_USER("Configure Succeeded", service_path);
   if (!connect_on_configure)
@@ skipping 22 matching lines @@
           base::Bind(&NetworkConnectImpl::OnConfigureSucceeded,
                      weak_factory_.GetWeakPtr(), connect_on_configure),
           base::Bind(&NetworkConnectImpl::OnConfigureFailed,
                      weak_factory_.GetWeakPtr()));
 }
 
 void NetworkConnectImpl::SetPropertiesFailed(
     const std::string& desc,
     const std::string& service_path,
     const std::string& config_error_name,
-    scoped_ptr<base::DictionaryValue> error_data) {
+    std::unique_ptr<base::DictionaryValue> error_data) {
   NET_LOG_ERROR(desc + ": Failed: " + config_error_name, service_path);
   network_state_notifier_->ShowNetworkConnectError(
       NetworkConnectionHandler::kErrorConfigureFailed, service_path);
 }
 
 void NetworkConnectImpl::SetPropertiesToClear(
     base::DictionaryValue* properties_to_set,
     std::vector<std::string>* properties_to_clear) {
   // Move empty string properties to properties_to_clear.
   for (base::DictionaryValue::Iterator iter(*properties_to_set);
@@ skipping 18 matching lines @@
   NetworkHandler::Get()->network_configuration_handler()->ClearShillProperties(
       service_path, properties_to_clear,
       base::Bind(&NetworkConnectImpl::CallConnectToNetwork,
                  weak_factory_.GetWeakPtr(), service_path, check_error_state),
       base::Bind(&NetworkConnectImpl::SetPropertiesFailed,
                  weak_factory_.GetWeakPtr(), "ClearProperties", service_path));
 }
 
 void NetworkConnectImpl::ConfigureSetProfileSucceeded(
     const std::string& service_path,
-    scoped_ptr<base::DictionaryValue> properties_to_set) {
+    std::unique_ptr<base::DictionaryValue> properties_to_set) {
   std::vector<std::string> properties_to_clear;
   SetPropertiesToClear(properties_to_set.get(), &properties_to_clear);
   NetworkHandler::Get()->network_configuration_handler()->SetShillProperties(
       service_path, *properties_to_set,
       NetworkConfigurationObserver::SOURCE_USER_ACTION,
       base::Bind(&NetworkConnectImpl::ClearPropertiesAndConnect,
                  weak_factory_.GetWeakPtr(), service_path, properties_to_clear),
       base::Bind(&NetworkConnectImpl::SetPropertiesFailed,
                  weak_factory_.GetWeakPtr(), "SetProperties", service_path));
 }
@@ skipping 124 matching lines @@
   }
   delegate_->ShowMobileSetupDialog(service_path);
 }
 
 void NetworkConnectImpl::ConfigureNetworkAndConnect(
     const std::string& service_path,
     const base::DictionaryValue& properties,
     bool shared) {
   NET_LOG_USER("ConfigureNetworkAndConnect", service_path);
 
-  scoped_ptr<base::DictionaryValue> properties_to_set(properties.DeepCopy());
+  std::unique_ptr<base::DictionaryValue> properties_to_set(
+      properties.DeepCopy());
 
   std::string profile_path;
   if (!GetNetworkProfilePath(shared, &profile_path)) {
     network_state_notifier_->ShowNetworkConnectError(
         NetworkConnectionHandler::kErrorConfigureFailed, service_path);
     return;
   }
   NetworkHandler::Get()->network_configuration_handler()->SetNetworkProfile(
       service_path, profile_path,
       NetworkConfigurationObserver::SOURCE_USER_ACTION,
@@ skipping 131 matching lines @@
   return g_network_connect;
 }
 
 NetworkConnect::NetworkConnect() {
 }
 
 NetworkConnect::~NetworkConnect() {
 }
 
 }  // namespace ui