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

Side by Side Diff: webrtc/media/engine/webrtcvideocapturerfactory.cc

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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/base/scoped_ptr.h" 11 #include <memory>
12
12 #include "webrtc/media/engine/webrtcvideocapturer.h" 13 #include "webrtc/media/engine/webrtcvideocapturer.h"
13 #include "webrtc/media/engine/webrtcvideocapturerfactory.h" 14 #include "webrtc/media/engine/webrtcvideocapturerfactory.h"
14 15
15 namespace cricket { 16 namespace cricket {
16 17
17 VideoCapturer* WebRtcVideoDeviceCapturerFactory::Create(const Device& device) { 18 VideoCapturer* WebRtcVideoDeviceCapturerFactory::Create(const Device& device) {
18 #ifdef HAVE_WEBRTC_VIDEO 19 #ifdef HAVE_WEBRTC_VIDEO
19 rtc::scoped_ptr<WebRtcVideoCapturer> capturer( 20 std::unique_ptr<WebRtcVideoCapturer> capturer(
20 new WebRtcVideoCapturer()); 21 new WebRtcVideoCapturer());
21 if (!capturer->Init(device)) { 22 if (!capturer->Init(device)) {
22 return nullptr; 23 return nullptr;
23 } 24 }
24 return capturer.release(); 25 return capturer.release();
25 #else 26 #else
26 return nullptr; 27 return nullptr;
27 #endif 28 #endif
28 } 29 }
29 30
30 } // namespace cricket 31 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvideocapturer_unittest.cc ('k') | webrtc/media/engine/webrtcvideoengine2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698