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

Unified Diff: media/cast/common/transport_encryption_handler.h

Issue 1905763002: Convert //media/cast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « media/cast/cast_sender_impl.cc ('k') | media/cast/logging/encoding_event_subscriber_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/common/transport_encryption_handler.h
diff --git a/media/cast/common/transport_encryption_handler.h b/media/cast/common/transport_encryption_handler.h
index 4dfa884a5c0f7d0976628536be16633f312b47ed..cf2734ab98caf9a67212c935caa5aa1b2389a926 100644
--- a/media/cast/common/transport_encryption_handler.h
+++ b/media/cast/common/transport_encryption_handler.h
@@ -9,10 +9,10 @@
#include <stdint.h>
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string_piece.h"
#include "base/threading/non_thread_safe.h"
@@ -42,8 +42,8 @@ class TransportEncryptionHandler : public base::NonThreadSafe {
bool is_activated() const { return is_activated_; }
private:
- scoped_ptr<crypto::SymmetricKey> key_;
- scoped_ptr<crypto::Encryptor> encryptor_;
+ std::unique_ptr<crypto::SymmetricKey> key_;
+ std::unique_ptr<crypto::Encryptor> encryptor_;
std::string iv_mask_;
bool is_activated_;
« no previous file with comments | « media/cast/cast_sender_impl.cc ('k') | media/cast/logging/encoding_event_subscriber_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698