Support HLS MPEG2 TS with SAMPLE-AES encryption.

media/base/test_data_util.h

Index: media/base/test_data_util.h
diff --git a/media/base/test_data_util.h b/media/base/test_data_util.h
index a71e2a5dc59a3604dd36b93e9b8718e624153976..82c13884a07bbd80e8d710291bbb53f84eb8701a 100644
--- a/media/base/test_data_util.h
+++ b/media/base/test_data_util.h
@@ -36,6 +36,18 @@ std::string GetURLQueryString(const base::StringPairs& query_params);
 //  |buffer| - The contents of the file.
 scoped_refptr<DecoderBuffer> ReadTestDataFile(const std::string& name);
 
+// If the provided |key_id| is that of the test key, returns true and fills the

[ddorwin, 2016/04/12 00:40:47]

s/the/a/ - we could support multiple

[dougsteed, 2016/05/08 23:18:44]

Done.

+// |key|, otherwise returns false. If |allowRotation| is true, then other valid
+// values are obtained by rotating the original key_id and key. Two overloads
+// are provided, one using vectors and one using strings.
+bool LookupTestKey(const std::vector<uint8_t>& key_id,

[ddorwin, 2016/04/12 00:40:47]

Consider ...Vector (and ...String below)
https://google.github.io/styleguide/cppguide.html#Function_Overloading

[dougsteed, 2016/05/08 23:18:44]

Done.

+                   std::vector<uint8_t>* key,
+                   bool allowRotation);

[ddorwin, 2016/04/12 00:40:47]

This should be before the output parameter.

[dougsteed, 2016/05/08 23:18:44]

Done.

+
+bool LookupTestKey(const std::string& key_id,
+                   std::string* key,
+                   bool allowRotation);
+
 }  // namespace media
 
 #endif  // MEDIA_BASE_TEST_DATA_UTIL_H_