media: Handle "encrypted" event in pipeline_integration_fuzzertest.

media/test/pipeline_integration_test_base.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
 #define MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
 
 #include <stdint.h>
 
 #include "base/md5.h"
@@ skipping 67 matching lines @@
   // Starts the pipeline with |data| (with |size| bytes). The |data| will be
   // valid throughtout the lifetime of this test.
   PipelineStatus Start(const uint8_t* data, size_t size, uint8_t test_type);
 
   void Play();
   void Pause();
   bool Seek(base::TimeDelta seek_time);
   bool Suspend();
   bool Resume(base::TimeDelta seek_time);
   void Stop();
+
   bool WaitUntilCurrentTimeIsAfter(const base::TimeDelta& wait_time);
-
   bool WaitUntilOnEnded();
   PipelineStatus WaitUntilEndedOrError();
 
+  // Sets |pipeline_status_| to an error status and stops the message loop.
+  void OnError(PipelineStatus status);

[ddorwin, 2016/03/03 17:47:47]

OnError sounds like an event handler. When public, the caller is saying
FailWithError or something like that. I suggest restoring this to protected and
adding a new public method that calls it.

[xhwang, 2016/03/03 19:41:32]

Done.

+
   // Returns the MD5 hash of all video frames seen.  Should only be called once
   // after playback completes.  First time hashes should be generated with
   // --video-threads=1 to ensure correctness.  Pipeline must have been started
   // with hashing enabled.
   std::string GetVideoHash();
 
   // Returns the hash of all audio frames seen.  Should only be called once
   // after playback completes.  Pipeline must have been started with hashing
   // enabled.
   std::string GetAudioHash();
 
   // Returns the time taken to render the complete audio file.
   // Pipeline must have been started with clockless playback enabled.
   base::TimeDelta GetAudioTime();
 
+  void set_encrypted_media_init_data_cb(
+      const Demuxer::EncryptedMediaInitDataCB& encrypted_media_init_data_cb) {
+    encrypted_media_init_data_cb_ = encrypted_media_init_data_cb;
+  }
+
  protected:
   base::MessageLoop message_loop_;
   base::MD5Context md5_context_;
   bool hashing_enabled_;
   bool clockless_playback_;
   scoped_ptr<Demuxer> demuxer_;
   scoped_ptr<DataSource> data_source_;
   scoped_ptr<PipelineImpl> pipeline_;
   scoped_refptr<NullAudioSink> audio_sink_;
   scoped_refptr<ClocklessAudioSink> clockless_audio_sink_;
@@ skipping 12 matching lines @@
                                uint8_t test_type);
 
   PipelineStatus StartWithFile(const std::string& filename,
                                CdmContext* cdm_context,
                                uint8_t test_type);
 
   void OnSeeked(base::TimeDelta seek_time, PipelineStatus status);
   void OnStatusCallback(PipelineStatus status);
   void DemuxerEncryptedMediaInitDataCB(EmeInitDataType type,
                                        const std::vector<uint8_t>& init_data);
-  void set_encrypted_media_init_data_cb(
-      const Demuxer::EncryptedMediaInitDataCB& encrypted_media_init_data_cb) {
-    encrypted_media_init_data_cb_ = encrypted_media_init_data_cb;
-  }
 
   void OnEnded();
-  void OnError(PipelineStatus status);
   void QuitAfterCurrentTimeTask(const base::TimeDelta& quit_time);
 
   // Creates Demuxer and sets |demuxer_|.
   void CreateDemuxer(scoped_ptr<DataSource> data_source);
 
   // Creates and returns a Renderer.
   virtual scoped_ptr<Renderer> CreateRenderer();
 
   void OnVideoFramePaint(const scoped_refptr<VideoFrame>& frame);
 
   MOCK_METHOD1(OnMetadata, void(PipelineMetadata));
   MOCK_METHOD1(OnBufferingStateChanged, void(BufferingState));
   MOCK_METHOD1(DecryptorAttached, void(bool));
   MOCK_METHOD2(OnAddTextTrack,
                void(const TextTrackConfig& config,
                     const AddTextTrackDoneCB& done_cb));
   MOCK_METHOD0(OnWaitingForDecryptionKey, void(void));
 };
 
 }  // namespace media
 
 #endif  // MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_