Index: media/capture/video/mac/video_capture_device_factory_mac.mm |
diff --git a/media/capture/video/mac/video_capture_device_factory_mac.mm b/media/capture/video/mac/video_capture_device_factory_mac.mm |
index 2098f3eeeb0ebc8857b53905ba9715d13c1bd84a..5d92f7eb12c9b2c6d0d5616090d8e97d54ab9ea7 100644 |
--- a/media/capture/video/mac/video_capture_device_factory_mac.mm |
+++ b/media/capture/video/mac/video_capture_device_factory_mac.mm |
@@ -7,6 +7,8 @@ |
#import <IOKit/audio/IOAudioTypes.h> |
#include <stddef.h> |
+#include <utility> |
+ |
#include "base/bind.h" |
#include "base/location.h" |
#include "base/macros.h" |
@@ -68,7 +70,7 @@ EnumerateDevicesUsingQTKit() { |
name.set_is_blacklisted(true); |
device_names->push_back(name); |
} |
- return device_names.Pass(); |
+ return device_names; |
} |
static void RunDevicesEnumeratedCallback( |
@@ -80,7 +82,7 @@ static void RunDevicesEnumeratedCallback( |
tracked_objects::ScopedTracker tracking_profile( |
FROM_HERE_WITH_EXPLICIT_FUNCTION( |
"458397 media::RunDevicesEnumeratedCallback")); |
- callback.Run(device_names.Pass()); |
+ callback.Run(std::move(device_names)); |
} |
VideoCaptureDeviceFactoryMac::VideoCaptureDeviceFactoryMac( |
@@ -109,7 +111,7 @@ scoped_ptr<VideoCaptureDevice> VideoCaptureDeviceFactoryMac::Create( |
capture_device.reset(); |
} |
} |
- return scoped_ptr<VideoCaptureDevice>(capture_device.Pass()); |
+ return scoped_ptr<VideoCaptureDevice>(std::move(capture_device)); |
} |
void VideoCaptureDeviceFactoryMac::GetDeviceNames( |
@@ -158,7 +160,7 @@ void VideoCaptureDeviceFactoryMac::EnumerateDeviceNames(const base::Callback< |
scoped_ptr<VideoCaptureDevice::Names> device_names( |
new VideoCaptureDevice::Names()); |
GetDeviceNames(device_names.get()); |
- callback.Run(device_names.Pass()); |
+ callback.Run(std::move(device_names)); |
} else { |
DVLOG(1) << "Enumerating video capture devices using QTKit"; |
base::PostTaskAndReplyWithResult( |