| Index: media/capture/video/video_capture_system.cc
|
| diff --git a/media/capture/video/video_capture_system.cc b/media/capture/video/video_capture_system.cc
|
| index 1758eb8fafeba39943ebc53a40cf2c731aa3e3e2..d716d275962de3fe8bb93d8bf5cff285b41bb149 100644
|
| --- a/media/capture/video/video_capture_system.cc
|
| +++ b/media/capture/video/video_capture_system.cc
|
| @@ -57,21 +57,21 @@ void ConsolidateCaptureFormats(media::VideoCaptureFormats* formats) {
|
|
|
| namespace media {
|
|
|
| -VideoCaptureSystem::VideoCaptureSystem(
|
| +VideoCaptureSystemImpl::VideoCaptureSystemImpl(
|
| std::unique_ptr<VideoCaptureDeviceFactory> factory)
|
| : factory_(std::move(factory)) {}
|
|
|
| -VideoCaptureSystem::~VideoCaptureSystem() = default;
|
| +VideoCaptureSystemImpl::~VideoCaptureSystemImpl() = default;
|
|
|
| -void VideoCaptureSystem::GetDeviceInfosAsync(
|
| +void VideoCaptureSystemImpl::GetDeviceInfosAsync(
|
| const DeviceInfoCallback& result_callback) {
|
| factory_->EnumerateDeviceDescriptors(media::BindToCurrentLoop(
|
| - base::Bind(&VideoCaptureSystem::OnDescriptorsReceived,
|
| + base::Bind(&VideoCaptureSystemImpl::OnDescriptorsReceived,
|
| base::Unretained(this), result_callback)));
|
| }
|
|
|
| // Creates a VideoCaptureDevice object. Returns NULL if something goes wrong.
|
| -std::unique_ptr<VideoCaptureDevice> VideoCaptureSystem::CreateDevice(
|
| +std::unique_ptr<VideoCaptureDevice> VideoCaptureSystemImpl::CreateDevice(
|
| const std::string& device_id) {
|
| const VideoCaptureDeviceInfo* device_info = LookupDeviceInfoFromId(device_id);
|
| if (!device_info)
|
| @@ -79,7 +79,7 @@ std::unique_ptr<VideoCaptureDevice> VideoCaptureSystem::CreateDevice(
|
| return factory_->CreateDevice(device_info->descriptor);
|
| }
|
|
|
| -void VideoCaptureSystem::OnDescriptorsReceived(
|
| +void VideoCaptureSystemImpl::OnDescriptorsReceived(
|
| const DeviceInfoCallback& result_callback,
|
| std::unique_ptr<VideoCaptureDeviceDescriptors> descriptors) {
|
| // For devices for which we already have an entry in |devices_info_cache_|,
|
| @@ -103,7 +103,7 @@ void VideoCaptureSystem::OnDescriptorsReceived(
|
| result_callback.Run(devices_info_cache_);
|
| }
|
|
|
| -const VideoCaptureDeviceInfo* VideoCaptureSystem::LookupDeviceInfoFromId(
|
| +const VideoCaptureDeviceInfo* VideoCaptureSystemImpl::LookupDeviceInfoFromId(
|
| const std::string& device_id) {
|
| auto iter = std::find_if(
|
| devices_info_cache_.begin(), devices_info_cache_.end(),
|
|
|