Remove StreamParser::NeedKeyCB return value since nothing ever returns false.

TESTS=All existing tests still pass.

Review URL: https://chromiumcodereview.appspot.com/18066009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209902 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 9 insertions, 28 deletions

diff --git a/media/base/stream_parser.h b/media/base/stream_parser.h
index a423f20..dfa4db9 100644
--- a/media/base/stream_parser.h
+++ b/media/base/stream_parser.h
@@ -73,10 +73,7 @@ class MEDIA_EXPORT StreamParser {
   //                   stream.
   // Second parameter - The initialization data associated with the stream.
   // Third parameter - Number of bytes of the initialization data.
-  // Return value - True indicates that the initialization data is accepted.
-  //                False if something was wrong with the initialization data
-  //                and a parsing error should be signalled.
-  typedef base::Callback<bool(const std::string&,
+  typedef base::Callback<void(const std::string&,
                               scoped_ptr<uint8[]>, int)> NeedKeyCB;
 
   // Initialize the parser with necessary callbacks. Must be called before any
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index 6ac4da5..7a9ed57 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -660,7 +660,7 @@ ChunkDemuxer::Status ChunkDemuxer::AddId(const std::string& id,
       audio_cb,
       video_cb,
       base::Bind(&ChunkDemuxer::OnTextBuffers, base::Unretained(this)),
-      base::Bind(&ChunkDemuxer::OnNeedKey, base::Unretained(this)),
+      need_key_cb_,
       add_text_track_cb_,
       base::Bind(&ChunkDemuxer::OnNewMediaSegment, base::Unretained(this), id),
       log_cb_);
@@ -1160,17 +1160,6 @@ bool ChunkDemuxer::OnTextBuffers(
   return true;
 }
 
-// TODO(acolwell): Remove bool from StreamParser::NeedKeyCB so that
-// this method can be removed and need_key_cb_ can be passed directly
-// to the parser.
-bool ChunkDemuxer::OnNeedKey(const std::string& type,
-                             scoped_ptr<uint8[]> init_data,
-                             int init_data_size) {
-  lock_.AssertAcquired();
-  need_key_cb_.Run(type, init_data.Pass(), init_data_size);
-  return true;
-}
-
 void ChunkDemuxer::OnNewMediaSegment(const std::string& source_id,
                                      TimeDelta timestamp) {
   DCHECK(timestamp != kNoTimestamp());
diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h
index 381fb2d..56f69c6 100644
--- a/media/filters/chunk_demuxer.h
+++ b/media/filters/chunk_demuxer.h
@@ -162,9 +162,6 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
   bool OnVideoBuffers(const StreamParser::BufferQueue& buffers);
   bool OnTextBuffers(TextTrack* text_track,
                      const StreamParser::BufferQueue& buffers);
-  bool OnNeedKey(const std::string& type,
-                 scoped_ptr<uint8[]> init_data,
-                 int init_data_size);
   void OnNewMediaSegment(const std::string& source_id,
                          base::TimeDelta start_timestamp);
 
diff --git a/media/mp4/mp4_stream_parser.cc b/media/mp4/mp4_stream_parser.cc
index 7274a5b..3d85509 100644
--- a/media/mp4/mp4_stream_parser.cc
+++ b/media/mp4/mp4_stream_parser.cc
@@ -312,7 +312,7 @@ bool MP4StreamParser::ParseMoov(BoxReader* reader) {
   if (!init_cb_.is_null())
     base::ResetAndReturn(&init_cb_).Run(true, duration);
 
-  RCHECK(EmitNeedKeyIfNecessary(moov_->pssh));
+  EmitNeedKeyIfNecessary(moov_->pssh);
   return true;
 }
 
@@ -323,19 +323,19 @@ bool MP4StreamParser::ParseMoof(BoxReader* reader) {
   if (!runs_)
     runs_.reset(new TrackRunIterator(moov_.get(), log_cb_));
   RCHECK(runs_->Init(moof));
-  RCHECK(EmitNeedKeyIfNecessary(moof.pssh));
+  EmitNeedKeyIfNecessary(moof.pssh);
   new_segment_cb_.Run(runs_->GetMinDecodeTimestamp());
   ChangeState(kEmittingSamples);
   return true;
 }
 
-bool MP4StreamParser::EmitNeedKeyIfNecessary(
+void MP4StreamParser::EmitNeedKeyIfNecessary(
     const std::vector<ProtectionSystemSpecificHeader>& headers) {
   // TODO(strobe): ensure that the value of init_data (all PSSH headers
   // concatenated in arbitrary order) matches the EME spec.
   // See https://www.w3.org/Bugs/Public/show_bug.cgi?id=17673.
   if (headers.empty())
-    return true;
+    return;
 
   size_t total_size = 0;
   for (size_t i = 0; i < headers.size(); i++)
@@ -348,7 +348,7 @@ bool MP4StreamParser::EmitNeedKeyIfNecessary(
            headers[i].raw_box.size());
     pos += headers[i].raw_box.size();
   }
-  return need_key_cb_.Run(kMp4InitDataType, init_data.Pass(), total_size);
+  need_key_cb_.Run(kMp4InitDataType, init_data.Pass(), total_size);
 }
 
 bool MP4StreamParser::PrepareAVCBuffer(
diff --git a/media/mp4/mp4_stream_parser.h b/media/mp4/mp4_stream_parser.h
index 7c9929a..88eee26 100644
--- a/media/mp4/mp4_stream_parser.h
+++ b/media/mp4/mp4_stream_parser.h
@@ -52,8 +52,7 @@ class MEDIA_EXPORT MP4StreamParser : public StreamParser {
   bool ParseMoov(mp4::BoxReader* reader);
   bool ParseMoof(mp4::BoxReader* reader);
 
-  // Returns 'true' if sent or not required, 'false' if there was an error.
-  bool EmitNeedKeyIfNecessary(
+  void EmitNeedKeyIfNecessary(
       const std::vector<ProtectionSystemSpecificHeader>& headers);
 
   // To retain proper framing, each 'mdat' atom must be read; to limit memory
diff --git a/media/mp4/mp4_stream_parser_unittest.cc b/media/mp4/mp4_stream_parser_unittest.cc
index f3d1e63..c271a80 100644
--- a/media/mp4/mp4_stream_parser_unittest.cc
+++ b/media/mp4/mp4_stream_parser_unittest.cc
@@ -87,13 +87,12 @@ class MP4StreamParserTest : public testing::Test {
     return true;
   }
 
-  bool KeyNeededF(const std::string& type,
+  void KeyNeededF(const std::string& type,
                   scoped_ptr<uint8[]> init_data, int init_data_size) {
     DVLOG(1) << "KeyNeededF: " << init_data_size;
     EXPECT_EQ(kMp4InitDataType, type);
     EXPECT_TRUE(init_data.get());
     EXPECT_GT(init_data_size, 0);
-    return true;
   }
 
   scoped_ptr<TextTrack> AddTextTrackF(