Index: content/browser/gamepad/gamepad_platform_data_fetcher_mac.h |
diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.h b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.h |
index ebfe57e35f458b31d18c19d1083ee42622ac76e9..d373fee3c5b95f13965f80a4f1f96f1684ab4442 100644 |
--- a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.h |
+++ b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.h |
@@ -5,20 +5,20 @@ |
#ifndef CONTENT_BROWSER_GAMEPAD_GAMEPAD_PLATFORM_DATA_FETCHER_MAC_H_ |
#define CONTENT_BROWSER_GAMEPAD_GAMEPAD_PLATFORM_DATA_FETCHER_MAC_H_ |
+#include <CoreFoundation/CoreFoundation.h> |
+#include <IOKit/hid/IOHIDManager.h> |
#include <stddef.h> |
+#include <memory> |
+ |
#include "base/compiler_specific.h" |
#include "base/mac/scoped_cftyperef.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "build/build_config.h" |
#include "content/browser/gamepad/gamepad_data_fetcher.h" |
#include "content/browser/gamepad/xbox_data_fetcher_mac.h" |
#include "content/common/gamepad_hardware_buffer.h" |
-#include <CoreFoundation/CoreFoundation.h> |
-#include <IOKit/hid/IOHIDManager.h> |
- |
#if defined(__OBJC__) |
@class NSArray; |
#else |
@@ -74,7 +74,7 @@ class GamepadPlatformDataFetcherMac : public GamepadDataFetcher, |
void SanitizeGamepadData(size_t index, blink::WebGamepad* pad); |
- scoped_ptr<XboxDataFetcher> xbox_fetcher_; |
+ std::unique_ptr<XboxDataFetcher> xbox_fetcher_; |
// Side-band data that's not passed to the consumer, but we need to maintain |
// to update data_. |