Index: media/webm/webm_content_encodings_client_unittest.cc |
diff --git a/media/webm/webm_content_encodings_client_unittest.cc b/media/webm/webm_content_encodings_client_unittest.cc |
index e7e37d15339c94996ed2868be47b570f13baa05e..bf45bd7b1b4791abfd479633c3bc699a0f7112fe 100644 |
--- a/media/webm/webm_content_encodings_client_unittest.cc |
+++ b/media/webm/webm_content_encodings_client_unittest.cc |
@@ -67,8 +67,7 @@ TEST_F(WebMContentEncodingsClientTest, SingleContentEncoding) { |
EXPECT_EQ(ContentEncoding::kTypeEncryption, content_encodings[0]->type()); |
EXPECT_EQ(ContentEncoding::kEncAlgoAes, |
content_encodings[0]->encryption_algo()); |
- EXPECT_TRUE(content_encodings[0]->encryption_key_id()); |
- EXPECT_EQ(8, content_encodings[0]->encryption_key_id_size()); |
+ EXPECT_EQ(8u, content_encodings[0]->encryption_key_id().size()); |
} |
TEST_F(WebMContentEncodingsClientTest, MultipleContentEncoding) { |
@@ -107,8 +106,7 @@ TEST_F(WebMContentEncodingsClientTest, MultipleContentEncoding) { |
EXPECT_EQ(ContentEncoding::kTypeEncryption, content_encodings[i]->type()); |
EXPECT_EQ(!i ? ContentEncoding::kEncAlgoAes : ContentEncoding::kEncAlgoDes, |
content_encodings[i]->encryption_algo()); |
- EXPECT_TRUE(content_encodings[i]->encryption_key_id()); |
- EXPECT_EQ(8, content_encodings[i]->encryption_key_id_size()); |
+ EXPECT_EQ(8u, content_encodings[i]->encryption_key_id().size()); |
} |
} |
@@ -136,8 +134,7 @@ TEST_F(WebMContentEncodingsClientTest, DefaultValues) { |
EXPECT_EQ(ContentEncoding::kTypeEncryption, content_encodings[0]->type()); |
EXPECT_EQ(ContentEncoding::kEncAlgoNotEncrypted, |
content_encodings[0]->encryption_algo()); |
- EXPECT_FALSE(content_encodings[0]->encryption_key_id()); |
- EXPECT_EQ(0, content_encodings[0]->encryption_key_id_size()); |
+ EXPECT_TRUE(content_encodings[0]->encryption_key_id().empty()); |
} |
TEST_F(WebMContentEncodingsClientTest, ContentEncodingsClientReuse) { |
@@ -172,8 +169,7 @@ TEST_F(WebMContentEncodingsClientTest, ContentEncodingsClientReuse) { |
EXPECT_EQ(ContentEncoding::kTypeEncryption, content_encodings[0]->type()); |
EXPECT_EQ(ContentEncoding::kEncAlgoAes, |
content_encodings[0]->encryption_algo()); |
- EXPECT_TRUE(content_encodings[0]->encryption_key_id()); |
- EXPECT_EQ(8, content_encodings[0]->encryption_key_id_size()); |
+ EXPECT_EQ(8u, content_encodings[0]->encryption_key_id().size()); |
} |
TEST_F(WebMContentEncodingsClientTest, InvalidContentEncodingOrder) { |
@@ -237,4 +233,4 @@ TEST_F(WebMContentEncodingsClientTest, InvalidContentEncAlgo) { |
ParseAndExpectToFail(kContentEncodings, size); |
} |
-} // media |
+} // namespace media |