Use std::string for decryption key ID in webm parser.

media/webm/webm_content_encodings_client_unittest.cc

 // 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.
 
 #include "media/webm/webm_constants.h"
 #include "media/webm/webm_content_encodings_client.h"
 #include "media/webm/webm_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
@@ skipping 49 matching lines @@
   const ContentEncodings& content_encodings = client_.content_encodings();
 
   ASSERT_EQ(1u, content_encodings.size());
   ASSERT_TRUE(content_encodings[0]);
   EXPECT_EQ(0, content_encodings[0]->order());
   EXPECT_EQ(ContentEncoding::kScopeAllFrameContents,
             content_encodings[0]->scope());
   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) {
   const uint8 kContentEncodings[] = {
     0x6D, 0x80, 0xC2,        // ContentEncodings (size = 66)
     0x62, 0x40, 0x9e,        //   ContentEncoding (size = 30)
     0x50, 0x31, 0x81, 0x00,  //     ContentEncodingOrder (size = 1)
     0x50, 0x32, 0x81, 0x03,  //     ContentEncodingScope (size = 1)
     0x50, 0x33, 0x81, 0x01,  //     ContentEncodingType (size = 1)
     0x50, 0x35, 0x8F,        //     ContentEncryption (size = 15)
@@ skipping 18 matching lines @@
 
   for (int i = 0; i < 2; ++i) {
     ASSERT_TRUE(content_encodings[i]);
     EXPECT_EQ(i, content_encodings[i]->order());
     EXPECT_EQ(ContentEncoding::kScopeAllFrameContents |
               ContentEncoding::kScopeTrackPrivateData,
               content_encodings[i]->scope());
     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());
   }
 }
 
 TEST_F(WebMContentEncodingsClientTest, DefaultValues) {
   const uint8 kContentEncodings[] = {
     0x6D, 0x80, 0x8A,        // ContentEncodings (size = 10)
     0x62, 0x40, 0x87,        //   ContentEncoding (size = 7)
                              //     ContentEncodingOrder missing
                              //     ContentEncodingScope missing
     0x50, 0x33, 0x81, 0x01,  //     ContentEncodingType (size = 1)
     0x50, 0x35, 0x80,        //     ContentEncryption (size = 0)
                              //     ContentEncAlgo missing
   };
   int size = sizeof(kContentEncodings);
 
   int result = parser_.Parse(kContentEncodings, size);
   ASSERT_EQ(size, result);
   const ContentEncodings& content_encodings = client_.content_encodings();
 
   ASSERT_EQ(1u, content_encodings.size());
   ASSERT_TRUE(content_encodings[0]);
   EXPECT_EQ(0, content_encodings[0]->order());
   EXPECT_EQ(ContentEncoding::kScopeAllFrameContents,
             content_encodings[0]->scope());
   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) {
   const uint8 kContentEncodings[] = {
     0x6D, 0x80, 0xA1,        // ContentEncodings (size = 33)
     0x62, 0x40, 0x9e,        //   ContentEncoding (size = 30)
     0x50, 0x31, 0x81, 0x00,  //     ContentEncodingOrder (size = 1)
     0x50, 0x32, 0x81, 0x01,  //     ContentEncodingScope (size = 1)
     0x50, 0x33, 0x81, 0x01,  //     ContentEncodingType (size = 1)
     0x50, 0x35, 0x8F,        //     ContentEncryption (size = 15)
@@ skipping 14 matching lines @@
   const ContentEncodings& content_encodings = client_.content_encodings();
 
   ASSERT_EQ(1u, content_encodings.size());
   ASSERT_TRUE(content_encodings[0]);
   EXPECT_EQ(0, content_encodings[0]->order());
   EXPECT_EQ(ContentEncoding::kScopeAllFrameContents,
             content_encodings[0]->scope());
   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) {
   const uint8 kContentEncodings[] = {
     0x6D, 0x80, 0x8E,        // ContentEncodings (size = 14)
     0x62, 0x40, 0x8B,        //   ContentEncoding (size = 11)
     0x50, 0x31, 0x81, 0xEE,  //     ContentEncodingOrder (size = 1), invalid
     0x50, 0x33, 0x81, 0x01,  //     ContentEncodingType (size = 1)
     0x50, 0x35, 0x80,        //     ContentEncryption (size = 0)
   };
@@ skipping 43 matching lines @@
     0x50, 0x33, 0x81, 0x01,  //     ContentEncodingType (size = 1)
     0x50, 0x35, 0x8F,        //     ContentEncryption (size = 15)
     0x47, 0xE1, 0x81, 0xEE,  //       ContentEncAlgo (size = 1), invalid
     0x47, 0xE2, 0x88,        //       ContentEncKeyID (size = 8)
     0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
   };
   int size = sizeof(kContentEncodings);
   ParseAndExpectToFail(kContentEncodings, size);
 }
 
-}  // media
+}  // namespace media