Fix incorrect opus seek preroll and flaky pre-skip removal.

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 "base/md5.h"
 #include "base/message_loop/message_loop.h"
 #include "media/audio/clockless_audio_sink.h"
@@ skipping 53 matching lines @@
   PipelineStatus WaitUntilEndedOrError();
 
   // Starts the pipeline (optionally with a CdmContext), returning the final
   // status code after it has started. |filename| points at a test file located
   // under media/test/data/.
   PipelineStatus Start(const std::string& filename);
   PipelineStatus Start(const std::string& filename, CdmContext* cdm_context);
 
   // Starts the pipeline in a particular mode for advanced testing and
   // benchmarking purposes (e.g., underflow is disabled to ensure consistent
-  // hashes).
-  enum kTestType { kHashed, kClockless };
-  PipelineStatus Start(const std::string& filename, kTestType test_type);
+  // hashes).  May be combined using the bitwise or operator.

[chcunningham, 2015/07/31 19:48:45]

Might mention that it must be powers of 2.

[DaleCurtis, 2015/08/03 22:49:53]

Done.

+  enum TestTypeFlags { kHashed = 1, kClockless = 2};
+  PipelineStatus Start(const std::string& filename, uint8_t test_type);
 
   void Play();
   void Pause();
   bool Seek(base::TimeDelta seek_time);
   void Stop();
   bool WaitUntilCurrentTimeIsAfter(const base::TimeDelta& wait_time);
 
   // 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
@@ skipping 55 matching lines @@
   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_