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

Side by Side Diff: webrtc/test/frame_generator_capturer.h

Issue 1942823002: Remove webrtc/base/scoped_ptr.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: fix additional scoped_ptr uses that had been added Created 4 years, 7 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
« no previous file with comments | « webrtc/test/fake_network_pipe.h ('k') | webrtc/test/test_suite.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_ 10 #ifndef WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_
11 #define WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_ 11 #define WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_
12 12
13 #include <memory> 13 #include <memory>
14 #include <string> 14 #include <string>
15 15
16 #include "webrtc/base/criticalsection.h" 16 #include "webrtc/base/criticalsection.h"
17 #include "webrtc/base/platform_thread.h" 17 #include "webrtc/base/platform_thread.h"
18 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/common_video/rotation.h" 18 #include "webrtc/common_video/rotation.h"
20 #include "webrtc/test/video_capturer.h" 19 #include "webrtc/test/video_capturer.h"
21 #include "webrtc/typedefs.h" 20 #include "webrtc/typedefs.h"
22 21
23 namespace webrtc { 22 namespace webrtc {
24 23
25 class CriticalSectionWrapper; 24 class CriticalSectionWrapper;
26 class EventTimerWrapper; 25 class EventTimerWrapper;
27 26
28 namespace test { 27 namespace test {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 71
73 int target_fps_; 72 int target_fps_;
74 VideoRotation fake_rotation_ = kVideoRotation_0; 73 VideoRotation fake_rotation_ = kVideoRotation_0;
75 74
76 int64_t first_frame_capture_time_; 75 int64_t first_frame_capture_time_;
77 }; 76 };
78 } // test 77 } // test
79 } // webrtc 78 } // webrtc
80 79
81 #endif // WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_ 80 #endif // WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_
OLDNEW
« no previous file with comments | « webrtc/test/fake_network_pipe.h ('k') | webrtc/test/test_suite.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698