OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 SRC_VOICE_ENGINE_MAIN_TEST_AUTO_TEST_STANDARD_AFTER_STREAMING_H_ | 11 #ifndef SRC_VOICE_ENGINE_MAIN_TEST_AUTO_TEST_STANDARD_AFTER_STREAMING_H_ |
12 #define SRC_VOICE_ENGINE_MAIN_TEST_AUTO_TEST_STANDARD_AFTER_STREAMING_H_ | 12 #define SRC_VOICE_ENGINE_MAIN_TEST_AUTO_TEST_STANDARD_AFTER_STREAMING_H_ |
13 | 13 |
14 #include "webrtc/base/scoped_ptr.h" | |
14 #include "webrtc/voice_engine/test/auto_test/fixtures/before_streaming_fixture.h " | 15 #include "webrtc/voice_engine/test/auto_test/fixtures/before_streaming_fixture.h " |
16 #include "webrtc/voice_engine/channel_proxy.h" | |
hlundin-webrtc
2016/03/07 15:59:22
Order of includes...
the sun
2016/03/07 16:11:35
Done. Also replaced scoped_ptr with unique_ptr.
| |
15 | 17 |
16 // This fixture will, in addition to the work done by its superclasses, | 18 // This fixture will, in addition to the work done by its superclasses, |
17 // start play back on construction. | 19 // start play back on construction. |
18 class AfterStreamingFixture : public BeforeStreamingFixture { | 20 class AfterStreamingFixture : public BeforeStreamingFixture { |
19 public: | 21 public: |
20 AfterStreamingFixture(); | 22 AfterStreamingFixture(); |
21 virtual ~AfterStreamingFixture() {} | 23 virtual ~AfterStreamingFixture() {} |
24 | |
25 protected: | |
26 rtc::scoped_ptr<webrtc::voe::ChannelProxy> channel_proxy_; | |
22 }; | 27 }; |
23 | 28 |
24 #endif // SRC_VOICE_ENGINE_MAIN_TEST_AUTO_TEST_STANDARD_AFTER_STREAMING_H_ | 29 #endif // SRC_VOICE_ENGINE_MAIN_TEST_AUTO_TEST_STANDARD_AFTER_STREAMING_H_ |
OLD | NEW |