Index: content/browser/gamepad/gamepad_provider.cc |
diff --git a/content/browser/gamepad/gamepad_provider.cc b/content/browser/gamepad/gamepad_provider.cc |
index fea94e012bd890490d48b9ac26efe2f70bfbd825..e006ca2eb6fbf0e8aaf7e028347c702b9c7c34bb 100644 |
--- a/content/browser/gamepad/gamepad_provider.cc |
+++ b/content/browser/gamepad/gamepad_provider.cc |
@@ -50,10 +50,10 @@ GamepadProvider::GamepadProvider() |
have_scheduled_do_poll_(false), |
devices_changed_(true), |
ever_had_user_gesture_(false) { |
- Initialize(scoped_ptr<GamepadDataFetcher>()); |
+ Initialize(std::unique_ptr<GamepadDataFetcher>()); |
} |
-GamepadProvider::GamepadProvider(scoped_ptr<GamepadDataFetcher> fetcher) |
+GamepadProvider::GamepadProvider(std::unique_ptr<GamepadDataFetcher> fetcher) |
: is_paused_(true), |
have_scheduled_do_poll_(false), |
devices_changed_(true), |
@@ -124,7 +124,7 @@ void GamepadProvider::OnDevicesChanged(base::SystemMonitor::DeviceType type) { |
devices_changed_ = true; |
} |
-void GamepadProvider::Initialize(scoped_ptr<GamepadDataFetcher> fetcher) { |
+void GamepadProvider::Initialize(std::unique_ptr<GamepadDataFetcher> fetcher) { |
size_t data_size = sizeof(GamepadHardwareBuffer); |
base::SystemMonitor* monitor = base::SystemMonitor::Get(); |
if (monitor) |
@@ -158,7 +158,7 @@ void GamepadProvider::Initialize(scoped_ptr<GamepadDataFetcher> fetcher) { |
} |
void GamepadProvider::DoInitializePollingThread( |
- scoped_ptr<GamepadDataFetcher> fetcher) { |
+ std::unique_ptr<GamepadDataFetcher> fetcher) { |
DCHECK(base::MessageLoop::current() == polling_thread_->message_loop()); |
DCHECK(!data_fetcher_.get()); // Should only initialize once. |