Annotated the scoped leak inside base::RSAPrivateKey::CreateFromPrivateKeyInf...

base/crypto/rsa_private_key_unittest.cc

 // Copyright (c) 2009 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 "base/crypto/rsa_private_key.h"
-#include "base/leak_annotations.h"
 #include "base/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Generate random private keys with two different sizes. Reimport, then
 // export them again. We should get back the same exact bytes.
 TEST(RSAPrivateKeyUnitTest, InitRandomTest) {
-  // This test currently leaks some memory,
-  // see http://crbug.com/34742
-  ANNOTATE_SCOPED_MEMORY_LEAK;
-
   scoped_ptr<base::RSAPrivateKey> keypair1(base::RSAPrivateKey::Create(1024));
   scoped_ptr<base::RSAPrivateKey> keypair2(base::RSAPrivateKey::Create(2048));
   ASSERT_TRUE(keypair1.get());
   ASSERT_TRUE(keypair2.get());
 
   std::vector<uint8> privkey1;
   std::vector<uint8> privkey2;
   std::vector<uint8> pubkey1;
   std::vector<uint8> pubkey2;
 
@@ skipping 19 matching lines @@
   ASSERT_TRUE(0 == memcmp(&privkey1.front(), &privkey3.front(),
                           privkey1.size()));
   ASSERT_TRUE(0 == memcmp(&privkey2.front(), &privkey4.front(),
                           privkey2.size()));
 }
 
 
 // Verify that generated public keys look good. This test data was generated
 // with the openssl command line tool.
 TEST(RSAPrivateKeyUnitTest, PublicKeyTest) {
-  // This test currently leaks some memory,
-  // see http://crbug.com/34742
-  ANNOTATE_SCOPED_MEMORY_LEAK;
-
   const uint8 private_key_info[] = {
     0x30, 0x82, 0x02, 0x78, 0x02, 0x01, 0x00, 0x30, 
     0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 
     0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82, 
     0x02, 0x62, 0x30, 0x82, 0x02, 0x5e, 0x02, 0x01, 
     0x00, 0x02, 0x81, 0x81, 0x00, 0xb8, 0x7f, 0x2b, 
     0x20, 0xdc, 0x7c, 0x9b, 0x0c, 0xdc, 0x51, 0x61, 
     0x99, 0x0d, 0x36, 0x0f, 0xd4, 0x66, 0x88, 0x08, 
     0x55, 0x84, 0xd5, 0x3a, 0xbf, 0x2b, 0xa4, 0x64, 
     0x85, 0x7b, 0x0c, 0x04, 0x13, 0x3f, 0x8d, 0xf4, 
@@ skipping 117 matching lines @@
 // See also: http://code.google.com/p/chromium/issues/detail?id=14877.
 //
 // Before we were handling this correctly, we would see one of two failures:
 // * RSAPrivateKey::CreateFromPrivateKeyInfo would return null because the
 //   underlying windows API failed to import the key.
 // * The import would succeed, but incorrectly interpret the data. On export,
 //   the key would contain different values.
 //
 // This test case verifies these two failures modes don't occur.
 TEST(RSAPrivateKeyUnitTest, ShortIntegers) {
-  // This test currently leaks some memory,
-  // see http://crbug.com/34742
-  ANNOTATE_SCOPED_MEMORY_LEAK;
-
   const uint8 short_integer_with_high_bit[] = {
     0x30, 0x82, 0x02, 0x77, 0x02, 0x01, 0x00, 0x30, 
     0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 
     0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82, 
     0x02, 0x61, 0x30, 0x82, 0x02, 0x5d, 0x02, 0x01, 
     0x00, 0x02, 0x81, 0x81, 0x00, 0x92, 0x59, 0x32, 
     0x7d, 0x8e, 0xaf, 0x2e, 0xd5, 0xb2, 0x5c, 0x67, 
     0xc8, 0x7d, 0x48, 0xb7, 0x84, 0x12, 0xd0, 0x76, 
     0xda, 0xe1, 0xa3, 0x1e, 0x40, 0x01, 0x14, 0x5c, 
     0xef, 0x26, 0x6e, 0x28, 0xa2, 0xf7, 0xa5, 0xb4, 
@@ skipping 176 matching lines @@
   ASSERT_TRUE(keypair1->ExportPrivateKey(&output1));
   ASSERT_TRUE(keypair2->ExportPrivateKey(&output2));
 
   ASSERT_EQ(input1.size(), output1.size());
   ASSERT_EQ(input2.size(), output2.size());
   ASSERT_TRUE(0 == memcmp(&output1.front(), &input1.front(),
                           input1.size()));
   ASSERT_TRUE(0 == memcmp(&output2.front(), &input2.front(),
                           input2.size()));
 }