| Index: media/base/user_input_monitor.cc
|
| diff --git a/media/base/user_input_monitor.cc b/media/base/user_input_monitor.cc
|
| index 105afb3935ce08511f691ce05db884ccfafd9fae..60ab0b675cb9cbf4513e1f2ccaf3c9a33d0c250c 100644
|
| --- a/media/base/user_input_monitor.cc
|
| +++ b/media/base/user_input_monitor.cc
|
| @@ -9,10 +9,10 @@
|
| namespace media {
|
|
|
| #ifdef DISABLE_USER_INPUT_MONITOR
|
| -scoped_ptr<UserInputMonitor> UserInputMonitor::Create(
|
| +std::unique_ptr<UserInputMonitor> UserInputMonitor::Create(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
|
| const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner) {
|
| - return scoped_ptr<UserInputMonitor>();
|
| + return nullptr;
|
| }
|
| #endif // DISABLE_USER_INPUT_MONITOR
|
|
|
|
|