Index: media/filters/decrypting_video_decoder.cc |
diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc |
index c819a2e5b98f424e6dba225a0eae025d42f57b1e..72fcd8bda002b82a9a441395c6d733f620f508a8 100644 |
--- a/media/filters/decrypting_video_decoder.cc |
+++ b/media/filters/decrypting_video_decoder.cc |
@@ -8,6 +8,7 @@ |
#include "base/callback_helpers.h" |
#include "base/debug/trace_event.h" |
#include "base/location.h" |
+#include "base/logging.h" |
#include "base/message_loop_proxy.h" |
#include "media/base/bind_to_loop.h" |
#include "media/base/decoder_buffer.h" |
@@ -29,7 +30,7 @@ DecryptingVideoDecoder::DecryptingVideoDecoder( |
state_(kUninitialized), |
request_decryptor_notification_cb_(request_decryptor_notification_cb), |
decryptor_(NULL), |
- key_added_while_pending_decode_(false), |
+ key_added_while_decode_pending_(false), |
trace_id_(0) { |
} |
@@ -332,8 +333,8 @@ void DecryptingVideoDecoder::DoDeliverFrame( |
DCHECK(!read_cb_.is_null()); |
DCHECK(pending_buffer_to_decode_); |
- bool need_to_try_again_if_nokey_is_returned = key_added_while_pending_decode_; |
- key_added_while_pending_decode_ = false; |
+ bool need_to_try_again_if_nokey_is_returned = key_added_while_decode_pending_; |
+ key_added_while_decode_pending_ = false; |
scoped_refptr<DecoderBuffer> scoped_pending_buffer_to_decode = |
pending_buffer_to_decode_; |
@@ -403,7 +404,7 @@ void DecryptingVideoDecoder::OnKeyAdded() { |
DCHECK(message_loop_->BelongsToCurrentThread()); |
if (state_ == kPendingDecode) { |
- key_added_while_pending_decode_ = true; |
+ key_added_while_decode_pending_ = true; |
return; |
} |