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

Unified Diff: webrtc/voice_engine/voice_engine_impl.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
« no previous file with comments | « webrtc/voice_engine/voe_codec_unittest.cc ('k') | webrtc/voice_engine/voice_engine_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/voice_engine_impl.h
diff --git a/webrtc/voice_engine/voice_engine_impl.h b/webrtc/voice_engine/voice_engine_impl.h
index f98f88121468d15ab24d3aee12609eb084f72f56..ed6efe3d9e7df2c91bc7bd22a221d5686d6c845d 100644
--- a/webrtc/voice_engine/voice_engine_impl.h
+++ b/webrtc/voice_engine/voice_engine_impl.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H
#define WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H
-#include "webrtc/base/scoped_ptr.h"
+#include <memory>
+
#include "webrtc/engine_configurations.h"
#include "webrtc/system_wrappers/include/atomic32.h"
#include "webrtc/voice_engine/voe_base_impl.h"
@@ -134,14 +135,14 @@ class VoiceEngineImpl : public voe::SharedData, // Must be the first base class
// Backdoor to access a voe::Channel object without a channel ID. This is only
// to be used while refactoring the VoE API!
- virtual rtc::scoped_ptr<voe::ChannelProxy> GetChannelProxy(int channel_id);
+ virtual std::unique_ptr<voe::ChannelProxy> GetChannelProxy(int channel_id);
// This is *protected* so that FakeVoiceEngine can inherit from the class and
// manipulate the reference count. See: fake_voice_engine.h.
protected:
Atomic32 _ref_count;
private:
- rtc::scoped_ptr<const Config> own_config_;
+ std::unique_ptr<const Config> own_config_;
};
} // namespace webrtc
« no previous file with comments | « webrtc/voice_engine/voe_codec_unittest.cc ('k') | webrtc/voice_engine/voice_engine_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698