| Index: device/hid/hid_service_linux.h
|
| diff --git a/device/hid/hid_service_linux.h b/device/hid/hid_service_linux.h
|
| index 7d928300ec17093454b310685cd43898677512b5..314a2496c37daf6f056bb728b22d477744d01f33 100644
|
| --- a/device/hid/hid_service_linux.h
|
| +++ b/device/hid/hid_service_linux.h
|
| @@ -5,6 +5,8 @@
|
| #ifndef DEVICE_HID_HID_SERVICE_LINUX_H_
|
| #define DEVICE_HID_HID_SERVICE_LINUX_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| @@ -37,19 +39,19 @@ class HidServiceLinux : public HidService {
|
| // functions are static and the necessary parameters are passed as a single
|
| // struct.
|
| #if defined(OS_CHROMEOS)
|
| - static void OnPathOpenComplete(scoped_ptr<ConnectParams> params,
|
| + static void OnPathOpenComplete(std::unique_ptr<ConnectParams> params,
|
| dbus::FileDescriptor fd);
|
| static void OnPathOpenError(const std::string& device_path,
|
| const ConnectCallback& callback,
|
| const std::string& error_name,
|
| const std::string& error_message);
|
| - static void ValidateFdOnBlockingThread(scoped_ptr<ConnectParams> params,
|
| + static void ValidateFdOnBlockingThread(std::unique_ptr<ConnectParams> params,
|
| dbus::FileDescriptor fd);
|
| #else
|
| - static void OpenOnBlockingThread(scoped_ptr<ConnectParams> params);
|
| + static void OpenOnBlockingThread(std::unique_ptr<ConnectParams> params);
|
| #endif
|
| - static void FinishOpen(scoped_ptr<ConnectParams> params);
|
| - static void CreateConnection(scoped_ptr<ConnectParams> params);
|
| + static void FinishOpen(std::unique_ptr<ConnectParams> params);
|
| + static void CreateConnection(std::unique_ptr<ConnectParams> params);
|
|
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
| scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
|
|
|