| Index: extensions/browser/api/networking_private/networking_private_chromeos.h
|
| diff --git a/extensions/browser/api/networking_private/networking_private_chromeos.h b/extensions/browser/api/networking_private/networking_private_chromeos.h
|
| index f393fcb613729e6a90b6d54c73088fdc02872f68..9cf77ba755c8d261730f617de229c5770d4774e4 100644
|
| --- a/extensions/browser/api/networking_private/networking_private_chromeos.h
|
| +++ b/extensions/browser/api/networking_private/networking_private_chromeos.h
|
| @@ -5,10 +5,10 @@
|
| #ifndef EXTENSIONS_BROWSER_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_CHROMEOS_H_
|
| #define EXTENSIONS_BROWSER_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_CHROMEOS_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "extensions/browser/api/networking_private/networking_private_delegate.h"
|
|
|
| @@ -28,7 +28,7 @@ class NetworkingPrivateChromeOS : public NetworkingPrivateDelegate {
|
| public:
|
| // |verify_delegate| is passed to NetworkingPrivateDelegate and may be NULL.
|
| NetworkingPrivateChromeOS(content::BrowserContext* browser_context,
|
| - scoped_ptr<VerifyDelegate> verify_delegate);
|
| + std::unique_ptr<VerifyDelegate> verify_delegate);
|
| ~NetworkingPrivateChromeOS() override;
|
|
|
| // NetworkingPrivateApi
|
| @@ -42,11 +42,11 @@ class NetworkingPrivateChromeOS : public NetworkingPrivateDelegate {
|
| const DictionaryCallback& success_callback,
|
| const FailureCallback& failure_callback) override;
|
| void SetProperties(const std::string& guid,
|
| - scoped_ptr<base::DictionaryValue> properties,
|
| + std::unique_ptr<base::DictionaryValue> properties,
|
| const VoidCallback& success_callback,
|
| const FailureCallback& failure_callback) override;
|
| void CreateNetwork(bool shared,
|
| - scoped_ptr<base::DictionaryValue> properties,
|
| + std::unique_ptr<base::DictionaryValue> properties,
|
| const StringCallback& success_callback,
|
| const FailureCallback& failure_callback) override;
|
| void ForgetNetwork(const std::string& guid,
|
| @@ -90,8 +90,8 @@ class NetworkingPrivateChromeOS : public NetworkingPrivateDelegate {
|
| const std::string& new_pin,
|
| const VoidCallback& success_callback,
|
| const FailureCallback& failure_callback) override;
|
| - scoped_ptr<base::ListValue> GetEnabledNetworkTypes() override;
|
| - scoped_ptr<DeviceStateList> GetDeviceStateList() override;
|
| + std::unique_ptr<base::ListValue> GetEnabledNetworkTypes() override;
|
| + std::unique_ptr<DeviceStateList> GetDeviceStateList() override;
|
| bool EnableNetworkType(const std::string& type) override;
|
| bool DisableNetworkType(const std::string& type) override;
|
| bool RequestScan() override;
|
| @@ -111,11 +111,12 @@ class NetworkingPrivateChromeOS : public NetworkingPrivateDelegate {
|
|
|
| // Handles connection failures, possibly showing UI for configuration
|
| // failures, then calls the appropriate callback.
|
| - void ConnectFailureCallback(const std::string& guid,
|
| - const VoidCallback& success_callback,
|
| - const FailureCallback& failure_callback,
|
| - const std::string& error_name,
|
| - scoped_ptr<base::DictionaryValue> error_data);
|
| + void ConnectFailureCallback(
|
| + const std::string& guid,
|
| + const VoidCallback& success_callback,
|
| + const FailureCallback& failure_callback,
|
| + const std::string& error_name,
|
| + std::unique_ptr<base::DictionaryValue> error_data);
|
|
|
| content::BrowserContext* browser_context_;
|
| base::WeakPtrFactory<NetworkingPrivateChromeOS> weak_ptr_factory_;
|
|
|