Index: webrtc/media/devices/devicemanager.h |
diff --git a/webrtc/media/devices/devicemanager.h b/webrtc/media/devices/devicemanager.h |
index 2aba791d70af35995f1fe5aa5681cfcad1624196..01f4cb3c9c57422d4c878465d109404b3e1923fe 100644 |
--- a/webrtc/media/devices/devicemanager.h |
+++ b/webrtc/media/devices/devicemanager.h |
@@ -12,10 +12,10 @@ |
#define WEBRTC_MEDIA_DEVICES_DEVICEMANAGER_H_ |
#include <map> |
+#include <memory> |
#include <string> |
#include <vector> |
-#include "webrtc/base/scoped_ptr.h" |
#include "webrtc/base/sigslot.h" |
#include "webrtc/base/stringencode.h" |
#include "webrtc/base/window.h" |
@@ -178,13 +178,13 @@ class DeviceManager : public DeviceManagerInterface { |
const char* const exclusion_list[]); |
bool initialized_; |
- rtc::scoped_ptr< |
+ std::unique_ptr< |
VideoDeviceCapturerFactory> video_device_capturer_factory_; |
- rtc::scoped_ptr< |
+ std::unique_ptr< |
ScreenCapturerFactory> screen_capturer_factory_; |
std::map<std::string, VideoFormat> max_formats_; |
- rtc::scoped_ptr<DeviceWatcher> watcher_; |
- rtc::scoped_ptr<rtc::WindowPicker> window_picker_; |
+ std::unique_ptr<DeviceWatcher> watcher_; |
+ std::unique_ptr<rtc::WindowPicker> window_picker_; |
}; |
} // namespace cricket |