| Index: media/test/pipeline_integration_test_base.h
|
| diff --git a/media/test/pipeline_integration_test_base.h b/media/test/pipeline_integration_test_base.h
|
| index c65ea45401459a07d352cb851c9eec55486c7fc4..8f859f9d304c2046863bf8c530e3e37ec374df77 100644
|
| --- a/media/test/pipeline_integration_test_base.h
|
| +++ b/media/test/pipeline_integration_test_base.h
|
| @@ -71,9 +71,10 @@ class PipelineIntegrationTestBase {
|
|
|
| // 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 (and as such must
|
| + // have values that are powers of two).
|
| + enum TestTypeFlags { kHashed = 1, kClockless = 2};
|
| + PipelineStatus Start(const std::string& filename, uint8_t test_type);
|
|
|
| void Play();
|
| void Pause();
|
|
|