diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 01:21:12 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 01:21:12 +0000 |
| commit | 55ae5ecc5017ecce6b2d42d383d7e6fff3e78703 (patch) | |
| tree | ae0eca7575207502e37356dd63fc6d54ff793300 /media/webm/webm_content_encodings.h | |
| parent | 6c7a6d221aefd8bf35e5e4368e91b532b5fd12c3 (diff) | |
| download | chromium_src-55ae5ecc5017ecce6b2d42d383d7e6fff3e78703.zip chromium_src-55ae5ecc5017ecce6b2d42d383d7e6fff3e78703.tar.gz chromium_src-55ae5ecc5017ecce6b2d42d383d7e6fff3e78703.tar.bz2 | |
Use std::string for decryption key ID in webm parser.
TBR=ddorwin@chromium.org
BUG=130689
TEST=media_unittests
Review URL: https://chromiumcodereview.appspot.com/10826098
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149556 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/webm/webm_content_encodings.h')
| -rw-r--r-- | media/webm/webm_content_encodings.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/media/webm/webm_content_encodings.h b/media/webm/webm_content_encodings.h index ea903d8..2866f25 100644 --- a/media/webm/webm_content_encodings.h +++ b/media/webm/webm_content_encodings.h @@ -5,6 +5,8 @@ #ifndef MEDIA_WEBM_WEBM_CONTENT_ENCODINGS_H_ #define MEDIA_WEBM_WEBM_CONTENT_ENCODINGS_H_ +#include <string> + #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "media/base/media_export.h" @@ -64,9 +66,7 @@ class MEDIA_EXPORT ContentEncoding { encryption_algo_ = encryption_algo; } - const uint8* encryption_key_id() const { return encryption_key_id_.get(); } - int encryption_key_id_size() const { return encryption_key_id_size_; } - + const std::string& encryption_key_id() const { return encryption_key_id_; } void SetEncryptionKeyId(const uint8* encryption_key_id, int size); CipherMode cipher_mode() const { return cipher_mode_; } @@ -77,8 +77,7 @@ class MEDIA_EXPORT ContentEncoding { Scope scope_; Type type_; EncryptionAlgo encryption_algo_; - scoped_array<uint8> encryption_key_id_; - int encryption_key_id_size_; + std::string encryption_key_id_; CipherMode cipher_mode_; DISALLOW_COPY_AND_ASSIGN(ContentEncoding); |