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

Side by Side Diff: webrtc/voice_engine/test/auto_test/voe_stress_test.h

Issue 1702983002: Replace scoped_ptr with unique_ptr in webrtc/voice_engine/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
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) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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 #ifndef WEBRTC_VOICE_ENGINE_VOE_STRESS_TEST_H 11 #ifndef WEBRTC_VOICE_ENGINE_VOE_STRESS_TEST_H
12 #define WEBRTC_VOICE_ENGINE_VOE_STRESS_TEST_H 12 #define WEBRTC_VOICE_ENGINE_VOE_STRESS_TEST_H
13 13
14 #include <memory>
15
14 #include "webrtc/base/platform_thread.h" 16 #include "webrtc/base/platform_thread.h"
15 #include "webrtc/base/scoped_ptr.h"
16 17
17 namespace voetest { 18 namespace voetest {
18 19
19 class VoETestManager; 20 class VoETestManager;
20 21
21 class VoEStressTest { 22 class VoEStressTest {
22 public: 23 public:
23 VoEStressTest(VoETestManager& mgr) : _mgr(mgr) { 24 VoEStressTest(VoETestManager& mgr) : _mgr(mgr) {
24 } 25 }
25 ~VoEStressTest() { 26 ~VoEStressTest() {
26 } 27 }
27 int DoTest(); 28 int DoTest();
28 29
29 private: 30 private:
30 int MenuSelection(); 31 int MenuSelection();
31 int StartStopTest(); 32 int StartStopTest();
32 int CreateDeleteChannelsTest(); 33 int CreateDeleteChannelsTest();
33 int MultipleThreadsTest(); 34 int MultipleThreadsTest();
34 35
35 static bool RunExtraApi(void* ptr); 36 static bool RunExtraApi(void* ptr);
36 bool ProcessExtraApi(); 37 bool ProcessExtraApi();
37 38
38 VoETestManager& _mgr; 39 VoETestManager& _mgr;
39 40
40 // TODO(pbos): Remove scoped_ptr and use PlatformThread directly. 41 // TODO(pbos): Remove unique_ptr and use PlatformThread directly.
41 rtc::scoped_ptr<rtc::PlatformThread> _ptrExtraApiThread; 42 std::unique_ptr<rtc::PlatformThread> _ptrExtraApiThread;
42 }; 43 };
43 44
44 } // namespace voetest 45 } // namespace voetest
45 46
46 #endif // WEBRTC_VOICE_ENGINE_VOE_STRESS_TEST_H 47 #endif // WEBRTC_VOICE_ENGINE_VOE_STRESS_TEST_H
OLDNEW
« no previous file with comments | « webrtc/voice_engine/test/auto_test/voe_output_test.cc ('k') | webrtc/voice_engine/test/auto_test/voe_stress_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698