diff options
| author | kwiberg@webrtc.org <kwiberg@webrtc.org> | 2015-02-26 14:34:55 +0000 |
|---|---|---|
| committer | kwiberg@webrtc.org <kwiberg@webrtc.org> | 2015-02-26 14:43:50 +0000 |
| commit | 00b8f6b3643332cce1ee711715f7fbb824d793ca (patch) | |
| tree | c9b615128a443fe938a38e09023ec700d8adf62b /webrtc/modules/audio_coding/neteq/neteq_unittest.cc | |
| parent | ac2d27d9ae74eb8d28ec0d5f12f70fa64461ab90 (diff) | |
| download | webrtc-00b8f6b3643332cce1ee711715f7fbb824d793ca.tar.gz | |
Use base/scoped_ptr.h; system_wrappers/interface/scoped_ptr.h is going away
BUG=
R=andrew@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/36229004
Cr-Commit-Position: refs/heads/master@{#8517}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8517 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/modules/audio_coding/neteq/neteq_unittest.cc')
| -rw-r--r-- | webrtc/modules/audio_coding/neteq/neteq_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc index 0d8f1a1cfb..b3d6f25f89 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc @@ -25,10 +25,10 @@ #include "gflags/gflags.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" #include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h" -#include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" #include "webrtc/typedefs.h" @@ -262,8 +262,8 @@ class NetEqDecodingTest : public ::testing::Test { NetEq* neteq_; NetEq::Config config_; - scoped_ptr<test::RtpFileSource> rtp_source_; - scoped_ptr<test::Packet> packet_; + rtc::scoped_ptr<test::RtpFileSource> rtp_source_; + rtc::scoped_ptr<test::Packet> packet_; unsigned int sim_clock_; int16_t out_data_[kMaxBlockSize]; int output_sample_rate_; |