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

Unified Diff: webrtc/voice_engine/test/auto_test/fakes/conference_transport.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 side-by-side diff with in-line comments
Download patch
Index: webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
diff --git a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
index cce6148f7eb963ebd6b527c35ba059113a0414b9..8fd745771128c70bd91067dd2e5fe781ced13a70 100644
--- a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
+++ b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
@@ -13,13 +13,13 @@
#include <deque>
#include <map>
+#include <memory>
#include <utility>
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/base/basictypes.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/platform_thread.h"
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
#include "webrtc/system_wrappers/include/event_wrapper.h"
@@ -130,7 +130,7 @@ class ConferenceTransport: public webrtc::Transport {
rtc::CriticalSection pq_crit_;
rtc::CriticalSection stream_crit_;
- const rtc::scoped_ptr<webrtc::EventWrapper> packet_event_;
+ const std::unique_ptr<webrtc::EventWrapper> packet_event_;
rtc::PlatformThread thread_;
unsigned int rtt_ms_;
@@ -156,7 +156,7 @@ class ConferenceTransport: public webrtc::Transport {
LoudestFilter loudest_filter_;
- const rtc::scoped_ptr<webrtc::RtpHeaderParser> rtp_header_parser_;
+ const std::unique_ptr<webrtc::RtpHeaderParser> rtp_header_parser_;
};
} // namespace voetest
« no previous file with comments | « webrtc/voice_engine/shared_data.cc ('k') | webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698