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

Side by Side Diff: webrtc/modules/desktop_capture/window_capturer_unittest.cc

Issue 1743203002: Replace scoped_ptr with unique_ptr in webrtc/modules/desktop_capture/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: More Windows reverts Created 4 years, 9 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 <memory>
12
11 #include "webrtc/modules/desktop_capture/window_capturer.h" 13 #include "webrtc/modules/desktop_capture/window_capturer.h"
12 14
13 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
14 #include "webrtc/base/scoped_ptr.h"
15 #include "webrtc/modules/desktop_capture/desktop_capture_options.h" 16 #include "webrtc/modules/desktop_capture/desktop_capture_options.h"
16 #include "webrtc/modules/desktop_capture/desktop_frame.h" 17 #include "webrtc/modules/desktop_capture/desktop_frame.h"
17 #include "webrtc/modules/desktop_capture/desktop_region.h" 18 #include "webrtc/modules/desktop_capture/desktop_region.h"
18 #include "webrtc/system_wrappers/include/logging.h" 19 #include "webrtc/system_wrappers/include/logging.h"
19 20
20 namespace webrtc { 21 namespace webrtc {
21 22
22 class WindowCapturerTest : public testing::Test, 23 class WindowCapturerTest : public testing::Test,
23 public DesktopCapturer::Callback { 24 public DesktopCapturer::Callback {
24 public: 25 public:
25 void SetUp() override { 26 void SetUp() override {
26 capturer_.reset( 27 capturer_.reset(
27 WindowCapturer::Create(DesktopCaptureOptions::CreateDefault())); 28 WindowCapturer::Create(DesktopCaptureOptions::CreateDefault()));
28 } 29 }
29 30
30 void TearDown() override {} 31 void TearDown() override {}
31 32
32 // DesktopCapturer::Callback interface 33 // DesktopCapturer::Callback interface
33 void OnCaptureCompleted(DesktopFrame* frame) override { frame_.reset(frame); } 34 void OnCaptureCompleted(DesktopFrame* frame) override { frame_.reset(frame); }
34 35
35 protected: 36 protected:
36 rtc::scoped_ptr<WindowCapturer> capturer_; 37 std::unique_ptr<WindowCapturer> capturer_;
37 rtc::scoped_ptr<DesktopFrame> frame_; 38 std::unique_ptr<DesktopFrame> frame_;
38 }; 39 };
39 40
40 // Verify that we can enumerate windows. 41 // Verify that we can enumerate windows.
41 TEST_F(WindowCapturerTest, Enumerate) { 42 TEST_F(WindowCapturerTest, Enumerate) {
42 WindowCapturer::WindowList windows; 43 WindowCapturer::WindowList windows;
43 EXPECT_TRUE(capturer_->GetWindowList(&windows)); 44 EXPECT_TRUE(capturer_->GetWindowList(&windows));
44 45
45 // Verify that window titles are set. 46 // Verify that window titles are set.
46 for (WindowCapturer::WindowList::iterator it = windows.begin(); 47 for (WindowCapturer::WindowList::iterator it = windows.begin();
47 it != windows.end(); ++it) { 48 it != windows.end(); ++it) {
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 } 80 }
80 continue; 81 continue;
81 } 82 }
82 83
83 EXPECT_GT(frame_->size().width(), 0); 84 EXPECT_GT(frame_->size().width(), 0);
84 EXPECT_GT(frame_->size().height(), 0); 85 EXPECT_GT(frame_->size().height(), 0);
85 } 86 }
86 } 87 }
87 88
88 } // namespace webrtc 89 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698