Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(267)

Unified Diff: webrtc/media/devices/fakedevicemanager.h

Issue 1728503002: Replace scoped_ptr with unique_ptr in webrtc/media/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up1
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/media/devices/devicemanager_unittest.cc ('k') | webrtc/media/devices/gdivideorenderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/devices/fakedevicemanager.h
diff --git a/webrtc/media/devices/fakedevicemanager.h b/webrtc/media/devices/fakedevicemanager.h
index 7f8e00fa2ee2b12a7c8749e24ce49dcecd5645e0..bf5140c5434f25d314248a60574417361541a605 100644
--- a/webrtc/media/devices/fakedevicemanager.h
+++ b/webrtc/media/devices/fakedevicemanager.h
@@ -11,10 +11,10 @@
#ifndef WEBRTC_MEDIA_DEVICES_FAKEDEVICEMANAGER_H_
#define WEBRTC_MEDIA_DEVICES_FAKEDEVICEMANAGER_H_
+#include <memory>
#include <string>
#include <vector>
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/window.h"
#include "webrtc/base/windowpicker.h"
#include "webrtc/media/base/fakevideocapturer.h"
@@ -213,7 +213,7 @@ class FakeDeviceManager : public DeviceManagerInterface {
std::vector<Device> output_devices_;
std::vector<Device> vidcap_devices_;
std::map<std::string, VideoFormat> max_formats_;
- rtc::scoped_ptr<
+ std::unique_ptr<
ScreenCapturerFactory> screen_capturer_factory_;
};
« no previous file with comments | « webrtc/media/devices/devicemanager_unittest.cc ('k') | webrtc/media/devices/gdivideorenderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698