Properly verify that input data is just 'pssh' boxes

media/cdm/cenc_utils_unittest.cc

Index: media/cdm/cenc_utils_unittest.cc
diff --git a/media/cdm/cenc_utils_unittest.cc b/media/cdm/cenc_utils_unittest.cc
index 3bc55ccda7ca37b1f8b16b7a718cf0c4f0190dda..21e24faab576106f120133c569e1cb8b3ad6f4fb 100644
--- a/media/cdm/cenc_utils_unittest.cc
+++ b/media/cdm/cenc_utils_unittest.cc
@@ -512,4 +512,30 @@ TEST_F(CencUtilsTest, GetPsshData_MultiplePssh) {
   EXPECT_EQ(data1, pssh_data);
   EXPECT_NE(data2, pssh_data);
 }
+
+TEST_F(CencUtilsTest, NonPsshData) {
+  const uint8_t data[] = {
+    0x00, 0x00, 0x00, 0x08,   // size = 8
+    'f',  'r',  'e',  'e'

[ddorwin, 2015/06/25 23:08:17]

Perhaps p s s g, to ensure all bytes are being checked.

[jrummell, 2015/06/30 00:06:03]

Done.

+  };
+  std::vector<uint8_t> free_box(data, data + arraysize(data));
+  EXPECT_FALSE(ValidatePsshInput(free_box));
+
+  // Make a valid 'pssh' box.
+  std::vector<uint8_t> pssh_box = MakePSSHBox(1, Key1());
+  EXPECT_TRUE(ValidatePsshInput(pssh_box));
+
+  // Concatentate the boxes together (|pssh_box| first).
+  std::vector<uint8_t> boxes;
+  boxes.insert(boxes.end(), pssh_box.begin(), pssh_box.end());
+  boxes.insert(boxes.end(), free_box.begin(), free_box.end());
+  EXPECT_FALSE(ValidatePsshInput(boxes));
+
+  // Repeat with |free_box| first.
+  boxes.clear();
+  boxes.insert(boxes.end(), free_box.begin(), free_box.end());
+  boxes.insert(boxes.end(), pssh_box.begin(), pssh_box.end());
+  EXPECT_FALSE(ValidatePsshInput(boxes));
+}
+
 }  // namespace media