summaryrefslogtreecommitdiffstats
path: root/media/webm
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-23 19:27:50 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-23 19:27:50 +0000
commit27573cfc88abde2ae103901ffdff5f038123555a (patch)
tree2e731cc4fa02f1dce0b6593f8dc52eceae1a0a4b /media/webm
parent5cbeb5091b6fad36d0e0ca5ab4d7f8fa55ea6f7c (diff)
downloadchromium_src-27573cfc88abde2ae103901ffdff5f038123555a.zip
chromium_src-27573cfc88abde2ae103901ffdff5f038123555a.tar.gz
chromium_src-27573cfc88abde2ae103901ffdff5f038123555a.tar.bz2
Cleanup: Remove unnecessary ".get()" from scoped_ptrs<>.
In r174057, enne@ added support for implicit testing to scoped_ptr<>. Removes these in media/. BUG=232084 Review URL: https://chromiumcodereview.appspot.com/13870018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/webm')
-rw-r--r--media/webm/webm_cluster_parser.cc2
-rw-r--r--media/webm/webm_stream_parser.cc2
-rw-r--r--media/webm/webm_tracks_parser.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/media/webm/webm_cluster_parser.cc b/media/webm/webm_cluster_parser.cc
index a0b95a8..1d47720 100644
--- a/media/webm/webm_cluster_parser.cc
+++ b/media/webm/webm_cluster_parser.cc
@@ -211,7 +211,7 @@ bool WebMClusterParser::OnBinary(int id, const uint8* data, int size) {
if (id != kWebMIdBlock)
return true;
- if (block_data_.get()) {
+ if (block_data_) {
MEDIA_LOG(log_cb_) << "More than 1 Block in a BlockGroup is not supported.";
return false;
}
diff --git a/media/webm/webm_stream_parser.cc b/media/webm/webm_stream_parser.cc
index 18310dd..fb070a9 100644
--- a/media/webm/webm_stream_parser.cc
+++ b/media/webm/webm_stream_parser.cc
@@ -219,7 +219,7 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) {
}
int WebMStreamParser::ParseCluster(const uint8* data, int size) {
- if (!cluster_parser_.get())
+ if (!cluster_parser_)
return -1;
int id;
diff --git a/media/webm/webm_tracks_parser.cc b/media/webm/webm_tracks_parser.cc
index 7703504..7d11f69 100644
--- a/media/webm/webm_tracks_parser.cc
+++ b/media/webm/webm_tracks_parser.cc
@@ -146,7 +146,7 @@ bool WebMTracksParser::OnListEnd(int id) {
}
std::string encryption_key_id;
- if (track_content_encodings_client_.get()) {
+ if (track_content_encodings_client_) {
DCHECK(!track_content_encodings_client_->content_encodings().empty());
// If we have multiple ContentEncoding in one track. Always choose the
// key id in the first ContentEncoding as the key id of the track.