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

media/webm/webm_cluster_parser_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 <algorithm>

[xhwang, 2012/08/01 17:18:33]

for std::min()

+
 #include "base/logging.h"
 #include "media/webm/cluster_builder.h"
 #include "media/webm/webm_cluster_parser.h"
 #include "media/webm/webm_constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::InSequence;
 using ::testing::Return;
 using ::testing::_;
@@ skipping 103 matching lines @@
     dest->push_back(*itr);
   }
 }
 
 class WebMClusterParserTest  : public testing::Test {
  public:
   WebMClusterParserTest()
       : parser_(new WebMClusterParser(kTimecodeScale,
                                       kAudioTrackNum,
                                       kVideoTrackNum,
-                                      NULL, 0)) {
+                                      std::string())) {
   }
 
  protected:
   scoped_ptr<WebMClusterParser> parser_;
 };
 
 TEST_F(WebMClusterParserTest, TestReset) {
   InSequence s;
 
   int block_count = arraysize(kDefaultBlockInfo);
@@ skipping 100 matching lines @@
   };
   int block_count = arraysize(kBlockInfo);
   scoped_ptr<Cluster> cluster(CreateCluster(0, kBlockInfo, block_count));
 
   int result = parser_->Parse(cluster->data(), cluster->size());
   EXPECT_EQ(cluster->size(), result);
   ASSERT_TRUE(VerifyBuffers(parser_, kBlockInfo, block_count));
 }
 
 }  // namespace media