zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use base/scoped_ptr.h; system_wrappers/interface/scoped_ptr.h is going away

Browse Source 
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
This commit is contained in:
kwiberg@webrtc.org
2015-02-26 14:34:55 +00:00
parent ac2d27d9ae
commit 00b8f6b364
391 changed files with 1427 additions and 1402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/test/rtp_file_reader_unittest.cc
View File

@ -11,8 +11,8 @@
#include <map>
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/rtp_file_reader.h"
#include "webrtc/test/testsupport/fileutils.h"
@ -43,7 +43,7 @@ class TestRtpFileReader : public ::testing::Test {
}
private:
scoped_ptr<test::RtpFileReader> rtp_packet_source_;
rtc::scoped_ptr<test::RtpFileReader> rtp_packet_source_;
bool headers_only_file_;
};
@ -93,7 +93,7 @@ class TestPcapFileReader : public ::testing::Test {
}
private:
scoped_ptr<test::RtpFileReader> rtp_packet_source_;
rtc::scoped_ptr<test::RtpFileReader> rtp_packet_source_;
};
TEST_F(TestPcapFileReader, TestEthernetIIFrame) {